diff --git a/ChangeLog b/ChangeLog
index 7ffe11f10b..cf99341942 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2006-05-24  Robert Love  <rml@novell.com>
+
+	* examples/python/systray/eggtrayicon.c, gnome/applet/eggtrayicon.c,
+	  gnome/applet/passphrase-dialog.c, gnome/applet/vpn-password-dialog.c,
+	  src/NetworkManager.c: Include <glib/gi18n.h> and not <libintl.h>.
+
 2006-05-24  Robert Love  <rml@novell.com>
 
 	* gnome/applet/Makefile.am, gnome/vpn-properties/Makefile.am,
diff --git a/examples/python/systray/eggtrayicon.c b/examples/python/systray/eggtrayicon.c
index 07ce5dfce0..cfabfe5743 100644
--- a/examples/python/systray/eggtrayicon.c
+++ b/examples/python/systray/eggtrayicon.c
@@ -20,7 +20,7 @@
 
 #include <config.h>
 #include <string.h>
-#include <libintl.h>
+#include <glib/gi18n.h>
 
 #include "eggtrayicon.h"
 
diff --git a/gnome/applet/eggtrayicon.c b/gnome/applet/eggtrayicon.c
index 1d4427fb76..68fa1d8187 100644
--- a/gnome/applet/eggtrayicon.c
+++ b/gnome/applet/eggtrayicon.c
@@ -20,7 +20,7 @@
 
 #include <config.h>
 #include <string.h>
-#include <libintl.h>
+#include <glib/gi18n.h>
 
 #include "eggtrayicon.h"
 
diff --git a/gnome/applet/passphrase-dialog.c b/gnome/applet/passphrase-dialog.c
index 70aa12f40e..2d05ec1db0 100644
--- a/gnome/applet/passphrase-dialog.c
+++ b/gnome/applet/passphrase-dialog.c
@@ -20,7 +20,6 @@
  */
 
 #include <config.h>
-#include <libintl.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
diff --git a/gnome/applet/vpn-password-dialog.c b/gnome/applet/vpn-password-dialog.c
index e32b5ee88f..a379ef1caa 100644
--- a/gnome/applet/vpn-password-dialog.c
+++ b/gnome/applet/vpn-password-dialog.c
@@ -20,7 +20,6 @@
  */
 
 #include <config.h>
-#include <libintl.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -29,7 +28,7 @@
 #include <glib.h>
 #include <dbus/dbus.h>
 #include <dbus/dbus-glib.h>
-#include <glib/gi18n-lib.h>
+#include <glib/gi18n.h>
 #include <unistd.h>
 
 #include "applet.h"
diff --git a/src/NetworkManager.c b/src/NetworkManager.c
index 1afba59e56..d459295d29 100644
--- a/src/NetworkManager.c
+++ b/src/NetworkManager.c
@@ -36,7 +36,7 @@
 #include <fcntl.h>
 #include <sys/stat.h>
 #include <sys/types.h>
-#include <libintl.h>
+#include <glib/gi18n.h>
 
 #include "NetworkManager.h"
 #include "nm-utils.h"