diff --git a/ChangeLog b/ChangeLog
index dd08a468e..2b292fdb6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2006-12-13  Matthias Clasen  <mclasen@redhat.com>
+
+	* m4macros/glib-gettext.m4: Require AC_CANONICAL_HOST in
+	GLIB_WITH_NLS.  (#385132, Laszlo Peter)
+
 2006-12-12  Matthias Clasen  <mclasen@redhat.com>
 
 	* configure.in: Add a check for broken poll on Mac OS X.
diff --git a/m4macros/glib-gettext.m4 b/m4macros/glib-gettext.m4
index 0934ea41d..4f71d6cea 100644
--- a/m4macros/glib-gettext.m4
+++ b/m4macros/glib-gettext.m4
@@ -101,7 +101,8 @@ AC_SUBST($1)dnl
 #-----------------
 glib_DEFUN([GLIB_WITH_NLS],
   dnl NLS is obligatory
-  [USE_NLS=yes
+  [AC_REQUIRE([AC_CANONICAL_HOST])dnl
+    USE_NLS=yes
     AC_SUBST(USE_NLS)
 
     gt_cv_have_gettext=no