diff --git a/config/ChangeLog b/config/ChangeLog
index 012fd5c67..d5e0440ca 100644
--- a/config/ChangeLog
+++ b/config/ChangeLog
@@ -1,3 +1,9 @@
+2006-06-13  Richard Earnshaw  <rearnsha@arm.com>
+	    Alexandre Oliva <aoliva@redhat.com>
+
+	* (ZW_GNU_GETTEXT_SISTER_DIR): Add optional
+	argument for where to search for NLS config file.
+
 2006-05-31  Daniel Jacobowitz  <dan@codesourcery.com>
 
 	* gettext-sister.m4 (ZW_GNU_GETTEXT_SISTER_DIR): Provide some
diff --git a/config/gettext-sister.m4 b/config/gettext-sister.m4
index 700d31fcf..e8e6b6684 100644
--- a/config/gettext-sister.m4
+++ b/config/gettext-sister.m4
@@ -19,8 +19,9 @@ INCINTL=	AC_SUBST(INCINTL)
 XGETTEXT=	AC_SUBST(XGETTEXT)
 GMSGFMT=	AC_SUBST(GMSGFMT)
 POSUB=		AC_SUBST(POSUB)
-if test -f ../intl/config.intl; then
-  . ../intl/config.intl
+
+if test -f  ifelse([$1],,[../intl],[$1])/config.intl; then
+  .  ifelse([$1],,[../intl],[$1])/config.intl
 fi
 AC_MSG_CHECKING([whether NLS is requested])
 if test x"$USE_NLS" != xyes; then