diff --git a/.cvsignore b/.cvsignore
index c33d9f3bbc..bfc2760b44 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -14,6 +14,7 @@ config.log
 config.status
 config.h
 config.h.in
+config.rpath
 cscope.out
 cscope.files
 depcomp
@@ -23,6 +24,7 @@ install-sh
 intl
 libtool
 ltconfig
+m4
 make-gnucash-patch
 make-gnucash-potfiles
 missing
diff --git a/ChangeLog b/ChangeLog
index 20b4e5f219..56ca6c4b2e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,16 @@
+2002-05-14  David Hampton  <hampton@employees.org>
+
+	* configure.in (AC_CANONICAL_HOST): Remove redundant command.
+	
+	* Makefile.am (ACLOCAL_AMFLAGS): New variable required by gettext
+	0.11.
+
+	* po/hu.po:
+	* po/it.po:
+	* po/jp.po: Fix errors that have become fatal in gettext 0.11.
+
+	* po/Makevars: New file required by gettext 0.11.
+
 2002-05-13   Derek Atkins   <derek@ihtfp.com>
 
 	Change the Search Dialog to use a CList and allow each object to
diff --git a/Makefile.am b/Makefile.am
index 26b2a0cf7c..7160cfd7f7 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -100,3 +100,5 @@ TAGS:
 endif
 
 .PHONY: TAGS
+
+ACLOCAL_AMFLAGS = -I m4
diff --git a/configure.in b/configure.in
index c5dc26e02d..c33f656cca 100644
--- a/configure.in
+++ b/configure.in
@@ -54,7 +54,6 @@ ALL_LINGUAS="da de en_GB es es_NI fr hu it ja no pt pt_BR ru sv"
 AM_GNU_GETTEXT
 
 
-AC_CANONICAL_HOST
 AM_MAINTAINER_MODE
 AM_ACLOCAL_INCLUDE(macros)
 
diff --git a/po/.cvsignore b/po/.cvsignore
index 0c0c5ce727..089fa3bb67 100644
--- a/po/.cvsignore
+++ b/po/.cvsignore
@@ -1,11 +1,17 @@
 .intltool-merge-cache
+.pot
 *.gmo
-*.pox
+*.header
 *.mo
+*.pox
+*.sed
+*.sin
 ChangeLog
 Makefile
 Makefile.in
 Makefile.in.in
+Makevars.template
 POTFILES
+Rules-quot
 gnucash.pot
 messages
diff --git a/po/Makevars b/po/Makevars
new file mode 100644
index 0000000000..0769424fba
--- /dev/null
+++ b/po/Makevars
@@ -0,0 +1,25 @@
+# Makefile variables for PO directory in any package using GNU gettext.
+
+# Usually the message domain is the same as the package name.
+DOMAIN = $(PACKAGE)
+
+# These two variables depend on the location of this directory.
+subdir = po
+top_builddir = ..
+
+# These options get passed to xgettext.
+XGETTEXT_OPTIONS = --keyword=_ --keyword=N_
+
+# This is the copyright holder that gets inserted into the header of the
+# $(DOMAIN).pot file.  Set this to the copyright holder of the surrounding
+# package.  (Note that the msgstr strings, extracted from the package's
+# sources, belong to the copyright holder of the package.)  Translators are
+# expected to transfer the copyright for their translations to this person
+# or entity, or to disclaim their copyright.  The empty string stands for
+# the public domain; in this case the translators are expected to disclaim
+# their copyright.
+COPYRIGHT_HOLDER = Gnumatic, Inc.
+
+# This is the list of locale categories, beyond LC_MESSAGES, for which the
+# message catalogs shall be used.  It is usually empty.
+EXTRA_LOCALE_CATEGORIES =
diff --git a/po/hu.po b/po/hu.po
index efb08487a5..e43eef6e7c 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -4,7 +4,7 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
+"Project-Id-Version: gnucash 1.7.X\n"
 "POT-Creation-Date: 2001-09-30 14:16-0700\n"
 "PO-Revision-Date: 2001-12-07 20:51GMT\n"
 "Last-Translator: Péter Hosszú <hosszu@web.de>\n"
diff --git a/po/it.po b/po/it.po
index 52a6e94fd7..5937fa0f7b 100644
--- a/po/it.po
+++ b/po/it.po
@@ -8,7 +8,7 @@ msgstr ""
 "POT-Creation-Date: 2001-06-09 16:49-0700\n"
 "PO-Revision-Date: 2000-07-05 15:17+0100\n"
 "Last-Translator: Alessandro Seveso <aleseveso@tiscalinet.it>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language-Team: Italian <it@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/po/ja.po b/po/ja.po
index 946008e4b7..86f8d85e59 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -57,6 +57,7 @@ msgid ""
 "Connection was lost, unable to send data."
 msgstr ""
 "¼¡¤Î¥Û¥¹¥È¤ËÀܳ¤Ç¤­¤Þ¤»¤ó\n"
+"   %s\n"
 "Àܳ¤¬¾Ã¼º¤·¤Þ¤·¤¿¡£¥Ç¡¼¥¿¤òÁ÷¤ë¤³¤È¤¬¤Ç¤­¤Þ¤»¤ó"
 
 #: src/FileDialog.c:98