diff --git a/ChangeLog b/ChangeLog
index 8ab56f661e..f15045c2fb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,12 +1,23 @@
-2005-06-19  Dan Williams <dcbw@redhat.com>
+2005-06-20  Robert Love  <rml@novell.com>
 
-    * src/NetworkManagerDevice.c
-        - (nm_device_wireless_process_scan_results): scan every 20s when
-            disconnected and scanning is ALWAYS_SCAN or WHEN_UNASSOCIATED
+	* Makefile.am: Add missing intltool-foo.in generated files to
+	  EXTRA_DIST so that 'distcheck' works.  Also add DISTCLEANFILES
+	  with the start of stuff to cleanup on 'distclea'.
+	* configure.in: add AC_PROG_INTLTOOL macro so that we do the intltool
+	  stuff right and 'distcheck' works.
+	* po/POTFILES.in: Remove examples/python/systray/eggtrayicon.c.  If
+	  we keep it, we need to add all of examples/* to EXTRA_DIST and do
+	  Makefile.am for each.  And systray/Makefile needs to be redone.
 
 2005-06-19  Dan Williams <dcbw@redhat.com>
 
-    * WEXT_DEBUG->IOCTL_DEBUG, extend checking to all ioctl() calls
+	* src/NetworkManagerDevice.c
+	- (nm_device_wireless_process_scan_results): scan every 20s when
+	  disconnected and scanning is ALWAYS_SCAN or WHEN_UNASSOCIATED
+
+2005-06-19  Dan Williams <dcbw@redhat.com>
+
+	* WEXT_DEBUG->IOCTL_DEBUG, extend checking to all ioctl() calls
 
 2005-06-18  Ray Strode <rstrode@redhat.com>
 
diff --git a/Makefile.am b/Makefile.am
index 99e0252fe2..02504ed123 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,6 +1,14 @@
 SUBDIRS = utils src dispatcher-daemon gnome initscript test po
 
-EXTRA_DIST = CONTRIBUTING NetworkManager.pc.in NetworkManager.h
+EXTRA_DIST =				\
+	CONTRIBUTING			\
+	NetworkManager.pc.in		\
+	NetworkManager.h		\
+	intltool-extract.in		\
+	intltool-merge.in		\
+	intltool-update.in
+
+DISTCLEANFILES = intltool-extract intltool-merge intltool-update
 
 pkgconfigdir = $(libdir)/pkgconfig
 
diff --git a/configure.in b/configure.in
index 2a0d341f4c..1b790b43cb 100644
--- a/configure.in
+++ b/configure.in
@@ -34,10 +34,14 @@ AC_PROG_GCC_TRADITIONAL
 AC_FUNC_MEMCMP
 AC_CHECK_FUNCS(select socket uname)
 
+dnl
+dnl translation support
+dnl
 GETTEXT_PACKAGE=NetworkManager
 AC_SUBST(GETTEXT_PACKAGE)
 AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE,"$GETTEXT_PACKAGE", [Gettext package])
 ALL_LINGUAS="bs cs da de el en_CA es fr gu hr hu it ja nb ne nl no pa pt_BR rw sk sq sr sr@Latn sv uk wa zh_CN zh_TW"
+AC_PROG_INTLTOOL([0.27.2])
 AM_GLIB_GNU_GETTEXT
 
 AC_ARG_WITH(distro, AC_HELP_STRING([--with-distro=DISTRO], [Specify the Linux distribution to target: One of redhat, suse, gentoo, debian, or slackware]))
diff --git a/po/POTFILES.in b/po/POTFILES.in
index f1190b506b..e33211418a 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -1,6 +1,5 @@
 # List of source files containing translatable strings.
 # Please keep this file sorted alphabetically.
-examples/python/systray/eggtrayicon.c
 gnome/applet/applet-dbus-info.c
 gnome/applet/applet-dbus.c
 gnome/applet/applet.c