diff --git a/configure.ac b/configure.ac
index 645e5467..a806580f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -14,16 +14,7 @@ AC_CANONICAL_HOST
 AC_CONFIG_HEADERS(config.h)
 MOO_DEFINE_VERSIONS
 
-
-AC_PROG_INTLTOOL([0.29])
-GETTEXT_PACKAGE=moo
-AC_SUBST(GETTEXT_PACKAGE)
-AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE, "$GETTEXT_PACKAGE", [Name of the gettext package.])
-ALL_LINGUAS="ru"
-AM_GLIB_GNU_GETTEXT
-MOO_INTLTOOL_INI_RULE='%.ini: %.ini.desktop.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
-AC_SUBST(MOO_INTLTOOL_INI_RULE)
-
+MOO_AC_I18N(moo, [ru])
 
 #  Check operating system
 MOO_AC_CHECK_OS
diff --git a/m4/moo-i18n.m4 b/m4/moo-i18n.m4
new file mode 100644
index 00000000..207c51b2
--- /dev/null
+++ b/m4/moo-i18n.m4
@@ -0,0 +1,16 @@
+##############################################################################
+# MOO_AC_I18N
+#
+AC_DEFUN([MOO_AC_I18N],[
+    AC_PROG_INTLTOOL([0.29])
+
+    GETTEXT_PACKAGE=$1
+    AC_SUBST(GETTEXT_PACKAGE)
+    AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE, "$GETTEXT_PACKAGE", [Name of the gettext package.])
+
+    ALL_LINGUAS="$2"
+    AM_GLIB_GNU_GETTEXT
+
+    MOO_INTLTOOL_INI_RULE='%.ini: %.ini.desktop.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
+    AC_SUBST(MOO_INTLTOOL_INI_RULE)
+])
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 90913ff2..1257e459 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -12,6 +12,7 @@ moo/mooedit/glade/quicksearch.glade
 moo/mooedit/glade/statusbar.glade
 moo/mooedit/plugins/fileselector/moofileselector-prefs.glade
 moo/mooedit/plugins/fileselector/moofileselector.glade
+moo/mooedit/plugins/fileselector/moofileselector.c
 moo/mooedit/plugins/moofind.glade
 moo/moofileview/glade/bookmark_editor.glade
 moo/moofileview/glade/drop.glade
diff --git a/po/maintain b/po/maintain
new file mode 100755
index 00000000..1ad2f350
--- /dev/null
+++ b/po/maintain
@@ -0,0 +1,6 @@
+#!/bin/sh
+if [ `basename $0` = pot ]; then
+    exec intltool-update --gettext-package=moo -p
+else
+    exec intltool-update -m
+fi