diff -urN wget-1.9-b5.org/configure.in wget-1.9-b5/configure.in
--- wget-1.9-b5.org/configure.in	2003-10-12 23:55:54.000000000 +0200
+++ wget-1.9-b5/configure.in	2003-10-13 00:24:45.000000000 +0200
@@ -46,14 +46,14 @@
 dnl Get cannonical host
 dnl
 AC_CANONICAL_HOST
-AC_DEFINE_UNQUOTED(OS_TYPE, "$host_os")
+AC_DEFINE_UNQUOTED(OS_TYPE, "$host_os", [OS type])
 
 dnl
 dnl Process features.
 dnl
 AC_ARG_WITH(socks,
 [  --with-socks            use the socks library],
-[AC_DEFINE(HAVE_SOCKS)])
+[AC_DEFINE(HAVE_SOCKS,,[Use the socks library])])
 
 AC_ARG_WITH(ssl,
 [[  --with-ssl[=SSL-ROOT]   link with SSL support [default=auto]
@@ -62,17 +62,17 @@
 AC_ARG_ENABLE(opie,
 [  --disable-opie          disable support for opie or s/key FTP login],
 USE_OPIE=$enableval, USE_OPIE=yes)
-test x"${USE_OPIE}" = xyes && AC_DEFINE(USE_OPIE)
+test x"${USE_OPIE}" = xyes && AC_DEFINE(USE_OPIE,,[FTP opie or s/key login support])
 
 AC_ARG_ENABLE(digest,
 [  --disable-digest        disable support for HTTP digest authorization],
 USE_DIGEST=$enableval, USE_DIGEST=yes)
-test x"${USE_DIGEST}" = xyes && AC_DEFINE(USE_DIGEST)
+test x"${USE_DIGEST}" = xyes && AC_DEFINE(USE_DIGEST,,[HTTP digest authorization support])
 
 AC_ARG_ENABLE(debug,
 [  --disable-debug         disable support for debugging output],
 ENABLE_DEBUG=$enableval, ENABLE_DEBUG=yes)
-test x"${ENABLE_DEBUG}" = xyes && AC_DEFINE(ENABLE_DEBUG)
+test x"${ENABLE_DEBUG}" = xyes && AC_DEFINE(ENABLE_DEBUG,,[Support for debugging output])
 
 wget_need_md5=no
 
@@ -382,7 +382,7 @@
     dnl AC_MSG_RESULT doesn't look right here, but I'm not sure what
     dnl to use instead.
     AC_MSG_RESULT([Compiling in support for SSL in $ssl_root])
-    AC_DEFINE(HAVE_SSL)
+    AC_DEFINE(HAVE_SSL,,[SSL support])
     AC_SUBST(SSL_INCLUDES)
     SSL_OBJ='gen_sslfunc$o'
     AC_SUBST(SSL_OBJ)
@@ -424,7 +424,7 @@
   dnl specific to the Solaris MD5 library.
   if test x"$found_md5" = xno; then
     AC_CHECK_LIB(md5, md5_calc, [
-      AC_DEFINE(HAVE_SOLARIS_MD5)
+      AC_DEFINE(HAVE_SOLARIS_MD5,,[Use Solaris MD5])
       LIBS="-lmd5 $LIBS"
       found_md5=yes
     ])
@@ -434,19 +434,19 @@
   dnl implementation.
   if test x"$found_md5" = xno; then
     if test x"$ssl_success" = xyes; then
-      AC_DEFINE(HAVE_OPENSSL_MD5)
+      AC_DEFINE(HAVE_OPENSSL_MD5,,[Use OpenSSL MD5])
       found_md5=yes
     fi
   fi
 
   dnl If none of the above worked, use the one we ship with Wget.
   if test x"$found_md5" = xno; then
-    AC_DEFINE(HAVE_BUILTIN_MD5)
+    AC_DEFINE(HAVE_BUILTIN_MD5,,[Use builtin MD5])
     found_md5=yes
     MD5_OBJ="$MD5_OBJ gnu-md5\$o"
   fi
 fi
-AC_DEFINE(HAVE_MD5)
+AC_DEFINE(HAVE_MD5,,[Have MD5])
 AC_SUBST(MD5_OBJ)
 
 dnl **********************************************************************
@@ -530,7 +530,7 @@
 dnl new language was added.
 
 dnl internationalization macros
-WGET_WITH_NLS
+AM_GNU_GETTEXT
 
 dnl
 dnl Find makeinfo.  If makeinfo is not found, look for Emacs.  If
@@ -563,6 +563,4 @@
 dnl Create output
 dnl
 AC_OUTPUT([Makefile src/Makefile doc/Makefile util/Makefile po/Makefile.in
-           windows/Makefile],
-[WGET_PROCESS_PO
-test -z "$CONFIG_HEADERS" || echo timestamp > stamp-h])
+           windows/Makefile])
diff -urN wget-1.9-b5.org/Makefile.in wget-1.9-b5/Makefile.in
--- wget-1.9-b5.org/Makefile.in	2003-10-12 23:55:54.000000000 +0200
+++ wget-1.9-b5/Makefile.in	2003-10-13 00:29:14.000000000 +0200
@@ -82,7 +82,7 @@
 infodir='$(infodir)' mandir='$(mandir)' manext='$(manext)'
 
 # subdirectories in the distribution
-SUBDIRS = src doc po util windows
+SUBDIRS = src doc intl po util windows
 
 # default target
 all: libtool src/config.h Makefile $(SUBDIRS)
@@ -106,7 +106,7 @@
 
 # Install `.mo' files
 install.mo:
-	cd po && $(MAKE) $(MAKEDEFS) $@
+	cd po && $(MAKE) $(MAKEDEFS) install
 
 # Regenerate libtool if ltconfig and/or ltmain are updated
 libtool: $(LIBTOOL_DEPS)
diff -urN wget-1.9-b5.org/src/main.c wget-1.9-b5/src/main.c
--- wget-1.9-b5.org/src/main.c	2003-10-12 23:55:54.000000000 +0200
+++ wget-1.9-b5/src/main.c	2003-10-13 00:14:16.000000000 +0200
@@ -44,11 +44,11 @@
 #ifdef HAVE_SIGNAL_H
 # include <signal.h>
 #endif
-#ifdef HAVE_NLS
+#ifdef ENABLE_NLS
 #ifdef HAVE_LOCALE_H
 # include <locale.h>
 #endif /* HAVE_LOCALE_H */
-#endif /* HAVE_NLS */
+#endif /* ENABLE_NLS */
 #include <errno.h>
 #ifndef errno
 extern int errno;
@@ -98,9 +98,9 @@
 static void
 i18n_initialize (void)
 {
-  /* If HAVE_NLS is defined, assume the existence of the three
+  /* If ENABLE_NLS is defined, assume the existence of the three
      functions invoked here.  */
-#ifdef HAVE_NLS
+#ifdef ENABLE_NLS
   /* Set the current locale.  */
   /* Here we use LC_MESSAGES instead of LC_ALL, for two reasons.
      First, message catalogs are all of I18N Wget uses anyway.
@@ -117,7 +117,7 @@
   /* Set the text message domain.  */
   bindtextdomain ("wget", LOCALEDIR);
   textdomain ("wget");
-#endif /* HAVE_NLS */
+#endif /* ENABLE_NLS */
 }
 
 /* Print the usage message.  */
diff -urN wget-1.9-b5.org/src/wget.h wget-1.9-b5/src/wget.h
--- wget-1.9-b5.org/src/wget.h	2003-10-12 23:55:54.000000000 +0200
+++ wget-1.9-b5/src/wget.h	2003-10-13 00:14:16.000000000 +0200
@@ -54,14 +54,12 @@
 
 /* `gettext (FOO)' is long to write, so we use `_(FOO)'.  If NLS is
    unavailable, _(STRING) simply returns STRING.  */
-#ifdef HAVE_NLS
+#ifdef ENABLE_NLS
 # define _(string) gettext (string)
-# ifdef HAVE_LIBINTL_H
 #  include <libintl.h>
-# endif /* HAVE_LIBINTL_H */
-#else  /* not HAVE_NLS */
+#else  /* not ENABLE_NLS */
 # define _(string) string
-#endif /* not HAVE_NLS */
+#endif /* not ENABLE_NLS */
 
 /* No-op version of gettext, used for constant strings. */
 #define N_(string) (string)