diff --git a/ChangeLog b/ChangeLog
index 0df32c9b5..4b3ada2a7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+Fri Nov 30 15:35:39 2001  Owen Taylor  <otaylor@redhat.com>
+
+	* configure.in: Added AM_GLIB_GNU_GETTEXT and
+	setting of GETTEXT_PACKAGE.
+
+	* Makefile.am: Change from xml-i18n-extract (etc.)
+	to intltool-extract (etc.)
+
 2001-11-29  Miles Lane <miles@megapathdsl.net>
 
 	* configure.in: Removed intl/Makefile from AC_OUTPUT
diff --git a/Makefile.am b/Makefile.am
index ce0285708..e6529d553 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -15,8 +15,8 @@ dist-hook: control-center.spec
 
 EXTRA_DIST = \
 	control-center.spec.in	\
-	xml-i18n-extract.in \
-	xml-i18n-merge.in \
-	xml-i18n-update.in \
+	intltool-extract.in \
+	intltool-merge.in \
+	intltool-update.in \
 	control-center.png
 
diff --git a/configure.in b/configure.in
index eb7581a2c..5f7c92721 100644
--- a/configure.in
+++ b/configure.in
@@ -14,8 +14,13 @@ AC_PROG_CC
 AC_STDC_HEADERS
 AM_PROG_LIBTOOL
 
+
 # Internationalization support
+GETTEXT_PACKAGE=control-center
+AC_SUBST(GETTEXT_PACKAGE)
+
 ALL_LINGUAS="az ca cs da de el en_GB es et fi fr ga gl hr hu it ja ko lt lv nl nn no pl pt pt_BR ro ru sk sl sv tr uk wa zh_CN zh_TW"
+AM_GLIB_GNU_GETTEXT
 AC_PROG_INTLTOOL
 
 AC_CHECK_FUNCS(usleep)