diff --git a/windows-NT/ChangeLog b/windows-NT/ChangeLog
index beaa8088612d9cf60ff2a149ba3ab0094e3c4529..3b1b604aaf6b4ef5bb9ff796de80a8f0d408b6c2 100644
--- a/windows-NT/ChangeLog
+++ b/windows-NT/ChangeLog
@@ -1,3 +1,7 @@
+2009-07-18  Derek Price  <derek@ximbiot.com>
+
+	* config.h, config.h.in: Regenerated with Autoconf 2.63.
+
 2008-11-25  Larry Jones  <lawrence.jones@siemens.com>
 
 	* Makefile.in: Regenerated with Autoconf 2.63.
diff --git a/windows-NT/config.h b/windows-NT/config.h
index cec9806f14eda659ffc96e87a2092431a73d6d14..448077867df2a8303fa3a1d8a76331e680d3bf99 100644
--- a/windows-NT/config.h
+++ b/windows-NT/config.h
@@ -22,6 +22,9 @@
 
 /* config.h.in.  Generated from configure.in by autoheader.  */
 
+/* Define if building universal (internal helper macro) */
+#undef AC_APPLE_UNIVERSAL_BUILD
+
 /* Define this to a NULL terminated list of allowed path prefixes (for
    directories) and paths to files the CVS server will allow configuration to
    be read from when specified from the command line. */
@@ -1372,18 +1375,21 @@
    'wint_t'. */
 #undef WINT_T_SUFFIX
 
-/* Define to 1 if your processor stores words with the most significant byte
-   first (like Motorola and SPARC, unlike Intel and VAX). */
-#undef WORDS_BIGENDIAN
+/* Define WORDS_BIGENDIAN to 1 if your processor stores words with the most
+   significant byte first (like Motorola and SPARC, unlike Intel). */
+#if defined AC_APPLE_UNIVERSAL_BUILD
+# if defined __BIG_ENDIAN__
+#  define WORDS_BIGENDIAN 1
+# endif
+#else
+# ifndef WORDS_BIGENDIAN
+#  undef WORDS_BIGENDIAN
+# endif
+#endif
 
 /* Number of bits in a file offset, on hosts where this is settable. */
 #undef _FILE_OFFSET_BITS
 
-/* Enable GNU extensions on systems that have them.  */
-#ifndef _GNU_SOURCE
-# undef _GNU_SOURCE
-#endif
-
 /* Define to 1 to make fseeko visible on some hosts (e.g. glibc 2.2). */
 #undef _LARGEFILE_SOURCE
 
diff --git a/windows-NT/config.h.in b/windows-NT/config.h.in
index 2ba495e80cb2c83ee479703cd113df7eb47899e7..8bfd06fbece2a4179a25a4b23a36a00a2366245c 100644
--- a/windows-NT/config.h.in
+++ b/windows-NT/config.h.in
@@ -15,6 +15,9 @@
 
 /* config.h.in.  Generated from configure.in by autoheader.  */
 
+/* Define if building universal (internal helper macro) */
+#undef AC_APPLE_UNIVERSAL_BUILD
+
 /* Define this to a NULL terminated list of allowed path prefixes (for
    directories) and paths to files the CVS server will allow configuration to
    be read from when specified from the command line. */
@@ -1365,18 +1368,21 @@
    'wint_t'. */
 #undef WINT_T_SUFFIX
 
-/* Define to 1 if your processor stores words with the most significant byte
-   first (like Motorola and SPARC, unlike Intel and VAX). */
-#undef WORDS_BIGENDIAN
+/* Define WORDS_BIGENDIAN to 1 if your processor stores words with the most
+   significant byte first (like Motorola and SPARC, unlike Intel). */
+#if defined AC_APPLE_UNIVERSAL_BUILD
+# if defined __BIG_ENDIAN__
+#  define WORDS_BIGENDIAN 1
+# endif
+#else
+# ifndef WORDS_BIGENDIAN
+#  undef WORDS_BIGENDIAN
+# endif
+#endif
 
 /* Number of bits in a file offset, on hosts where this is settable. */
 #undef _FILE_OFFSET_BITS
 
-/* Enable GNU extensions on systems that have them.  */
-#ifndef _GNU_SOURCE
-# undef _GNU_SOURCE
-#endif
-
 /* Define to 1 to make fseeko visible on some hosts (e.g. glibc 2.2). */
 #undef _LARGEFILE_SOURCE
 
diff --git a/windows-NT/stamp-chi b/windows-NT/stamp-chi
index 2ba495e80cb2c83ee479703cd113df7eb47899e7..8bfd06fbece2a4179a25a4b23a36a00a2366245c 100644
--- a/windows-NT/stamp-chi
+++ b/windows-NT/stamp-chi
@@ -15,6 +15,9 @@
 
 /* config.h.in.  Generated from configure.in by autoheader.  */
 
+/* Define if building universal (internal helper macro) */
+#undef AC_APPLE_UNIVERSAL_BUILD
+
 /* Define this to a NULL terminated list of allowed path prefixes (for
    directories) and paths to files the CVS server will allow configuration to
    be read from when specified from the command line. */
@@ -1365,18 +1368,21 @@
    'wint_t'. */
 #undef WINT_T_SUFFIX
 
-/* Define to 1 if your processor stores words with the most significant byte
-   first (like Motorola and SPARC, unlike Intel and VAX). */
-#undef WORDS_BIGENDIAN
+/* Define WORDS_BIGENDIAN to 1 if your processor stores words with the most
+   significant byte first (like Motorola and SPARC, unlike Intel). */
+#if defined AC_APPLE_UNIVERSAL_BUILD
+# if defined __BIG_ENDIAN__
+#  define WORDS_BIGENDIAN 1
+# endif
+#else
+# ifndef WORDS_BIGENDIAN
+#  undef WORDS_BIGENDIAN
+# endif
+#endif
 
 /* Number of bits in a file offset, on hosts where this is settable. */
 #undef _FILE_OFFSET_BITS
 
-/* Enable GNU extensions on systems that have them.  */
-#ifndef _GNU_SOURCE
-# undef _GNU_SOURCE
-#endif
-
 /* Define to 1 to make fseeko visible on some hosts (e.g. glibc 2.2). */
 #undef _LARGEFILE_SOURCE