diff --git a/configure.ac b/configure.ac
index e52bfeaf..d9879013 100644
--- a/configure.ac
+++ b/configure.ac
@@ -87,6 +87,7 @@ GETTEXT_PACKAGE=$PACKAGE
 AC_SUBST(GETTEXT_PACKAGE)
 AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE,"$GETTEXT_PACKAGE", [Define to the read-only architecture-independent data directory.])
 AM_GLIB_GNU_GETTEXT
+AM_GLIB_DEFINE_LOCALEDIR(EEKBOARD_LOCALEDIR)
 
 AC_CONFIG_HEADERS([eek/config.h])
 AC_CONFIG_FILES([Makefile
diff --git a/src/eekboard.c b/src/eekboard.c
index b2b5b9fe..69b06f0a 100644
--- a/src/eekboard.c
+++ b/src/eekboard.c
@@ -37,10 +37,6 @@
 #include <stdlib.h>
 #include <stdio.h>
 
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif  /* HAVE_CONFIG_H */
-
 #if HAVE_CLUTTER_GTK
 #include "eek/eek-clutter.h"
 #endif
@@ -540,6 +536,13 @@ main (int argc, char *argv[])
         exit (1);
     }
 
+#ifdef ENABLE_NLS
+    bindtextdomain (GETTEXT_PACKAGE, EEKBOARD_LOCALEDIR);
+    bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
+
+    gtk_set_locale ();
+#endif
+
     window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
     gtk_widget_set_can_focus (window, FALSE);
     g_object_set (G_OBJECT(window), "accept_focus", FALSE, NULL);