diff --git a/ChangeLog b/ChangeLog
index 5046e1580..4ec20b66b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2006-05-24  Robert Love  <rml@novell.com>
+
+	* gnome/applet/main.c, gnome/vpn-properties/nm-vpn-properties.c,
+	  src/NetworkManager.c: Take care to call bindtextdomain with the
+	  location of msgid files.
+	* src/Makefile.am: Set GNOMELOCALEDIR to the location of GNOME mo
+	  files.
+
 2006-05-22  Robert Love  <rml@novell.com>
 
 	* src/nm-device-802-11-wireless.c: Don't chain up to the parent's
diff --git a/gnome/applet/main.c b/gnome/applet/main.c
index 964adff2b..0ec417afa 100644
--- a/gnome/applet/main.c
+++ b/gnome/applet/main.c
@@ -52,7 +52,7 @@ int main (int argc, char *argv[])
     	g_signal_connect (client, "save_yourself", G_CALLBACK (gtk_true), NULL);
     	g_signal_connect (client, "die", G_CALLBACK (session_die), NULL);
 
-	bindtextdomain (GETTEXT_PACKAGE, NULL);
+	bindtextdomain (GETTEXT_PACKAGE, GNOMELOCALEDIR);
 	bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
 	textdomain (GETTEXT_PACKAGE);
 
diff --git a/gnome/vpn-properties/nm-vpn-properties.c b/gnome/vpn-properties/nm-vpn-properties.c
index 72ad44ec4..233bb5a1d 100644
--- a/gnome/vpn-properties/nm-vpn-properties.c
+++ b/gnome/vpn-properties/nm-vpn-properties.c
@@ -1086,7 +1086,7 @@ main (int argc, char *argv[])
 			{ NULL, 0, 0, G_OPTION_ARG_NONE, NULL, NULL, NULL }
 	};
 
-	bindtextdomain (GETTEXT_PACKAGE, NULL);
+	bindtextdomain (GETTEXT_PACKAGE, GNOMELOCALEDIR);
 	bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
 	textdomain (GETTEXT_PACKAGE);
 
diff --git a/src/Makefile.am b/src/Makefile.am
index 302d1f5de..80632e18d 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -106,6 +106,7 @@ NetworkManager_CPPFLAGS = 							\
 	-DSYSCONFDIR=\"$(sysconfdir)\"					\
 	-DLOCALSTATEDIR=\"$(localstatedir)\"				\
 	-DNM_RUN_DIR=\"$(rundir)\"						\
+	-DGNOMELOCALEDIR=\""$(prefix)/$(DATADIRNAME)/locale"\"		\
 	-DARP_DEBUG
 
 
diff --git a/src/NetworkManager.c b/src/NetworkManager.c
index 8953af0c5..1afba59e5 100644
--- a/src/NetworkManager.c
+++ b/src/NetworkManager.c
@@ -19,6 +19,10 @@
  * (C) Copyright 2004 Red Hat, Inc.
  */
 
+#ifdef HAVE_CONFIG_H
+# include <config.h>
+#endif
+
 #include <glib.h>
 #include <dbus/dbus.h>
 #include <dbus/dbus-glib-lowlevel.h>
@@ -32,6 +36,7 @@
 #include <fcntl.h>
 #include <sys/stat.h>
 #include <sys/types.h>
+#include <libintl.h>
 
 #include "NetworkManager.h"
 #include "nm-utils.h"
@@ -684,6 +689,10 @@ int main( int argc, char *argv[] )
 		return (EXIT_FAILURE);
 	}
 
+	bindtextdomain (GETTEXT_PACKAGE, GNOMELOCALEDIR);
+	bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
+	textdomain (GETTEXT_PACKAGE);
+
 	/* Parse options */
 	while (1)
 	{