diff --git a/autogen.sh b/autogen.sh
index 2e6c277..b42da26 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -6,7 +6,7 @@ rm -f aclocal.m4 ltmain.sh
 touch README
 
 echo "Running autopoint..." ; autopoint -f || :
-echo "Running aclocal..." ; aclocal $ACLOCAL_FLAGS || exit 1
+echo "Running aclocal..." ; aclocal $ACLOCAL_FLAGS -I m4 || exit 1
 echo "Running autoheader..." ; autoheader || exit 1
 echo "Running autoconf..." ; autoconf || exit 1
 echo "Running libtoolize..." ; (libtoolize --copy --automake || glibtoolize --automake) || exit 1
diff --git a/po/LINGUAS b/po/LINGUAS
new file mode 100644
index 0000000..7d5856f
--- /dev/null
+++ b/po/LINGUAS
@@ -0,0 +1 @@
+it
diff --git a/po/Makefile.am b/po/Makefile.am
deleted file mode 100644
index 814cae7..0000000
--- a/po/Makefile.am
+++ /dev/null
@@ -1,28 +0,0 @@
-MAINTAINERCLEANFILES = Makefile.in $(PACKAGE).pot
-
-MSGFMT = msgfmt
-
-localedir = @LOCALEDIR@
-locale_DATA = $(addsuffix .mo,$(ALL_LINGUAS))
-
-EXTRA_DIST = $(PACKAGE).pot $(addsuffix .po,$(ALL_LINGUAS))
-
-%.mo : %.po
-	$(MSGFMT) -f -o $@ $<
-
-install-localeDATA:
-uninstall-localeDATA:
-install-data-local:
-	for L in $(ALL_LINGUAS); do \
-	  $(mkinstalldirs) $(DESTDIR)$(localedir)/$$L/LC_MESSAGES; \
-	  $(INSTALL_DATA) \
-	  $$L.mo $(DESTDIR)$(localedir)/$$L/LC_MESSAGES/$(PACKAGE).mo; \
-	done
-
-uninstall:
-	for L in $(ALL_LINGUAS); do \
-	  rm -f  $(DESTDIR)$(localedir)/$$L/LC_MESSAGES/$(PACKAGE).mo; \
-	done
-
-clean-local:
-	rm -f *.mo
diff --git a/po/Makevars b/po/Makevars
new file mode 100644
index 0000000..22837ab
--- /dev/null
+++ b/po/Makevars
@@ -0,0 +1,41 @@
+# Makefile variables for PO directory in any package using GNU gettext.
+
+# Usually the message domain is the same as the package name.
+DOMAIN = $(PACKAGE)
+
+# These two variables depend on the location of this directory.
+subdir = po
+top_builddir = ..
+
+# These options get passed to xgettext.
+XGETTEXT_OPTIONS = --keyword=_ --keyword=N_ --from-code=UTF-8 --foreign-user
+
+# This is the copyright holder that gets inserted into the header of the
+# $(DOMAIN).pot file.  Set this to the copyright holder of the surrounding
+# package.  (Note that the msgstr strings, extracted from the package's
+# sources, belong to the copyright holder of the package.)  Translators are
+# expected to transfer the copyright for their translations to this person
+# or entity, or to disclaim their copyright.  The empty string stands for
+# the public domain; in this case the translators are expected to disclaim
+# their copyright.
+COPYRIGHT_HOLDER = Enlightenment development team
+
+# This is the email address or URL to which the translators shall report
+# bugs in the untranslated strings:
+# - Strings which are not entire sentences, see the maintainer guidelines
+#   in the GNU gettext documentation, section 'Preparing Strings'.
+# - Strings which use unclear terms or require additional context to be
+#   understood.
+# - Strings which make invalid assumptions about notation of date, time or
+#   money.
+# - Pluralisation problems.
+# - Incorrect English spelling.
+# - Incorrect formatting.
+# It can be your email address, or a mailing list address where translators
+# can write to without being subscribed, or the URL of a web page through
+# which the translators can contact you.
+MSGID_BUGS_ADDRESS = enlightenment-devel@lists.sourceforge.net
+
+# This is the list of locale categories, beyond LC_MESSAGES, for which the
+# message catalogs shall be used.  It is usually empty.
+EXTRA_LOCALE_CATEGORIES =
diff --git a/po/POTFILES.in b/po/POTFILES.in
new file mode 100644
index 0000000..307b49c
--- /dev/null
+++ b/po/POTFILES.in
@@ -0,0 +1,16 @@
+config.h
+e_mod_config_box.c
+e_mod_config_box.h
+e_mod_config.c
+e_mod_main.c
+e_mod_main.h
+imap2.c
+imap2.h
+imap.c
+imap.h
+mbox.c
+mbox.h
+mdir.c
+mdir.h
+pop.c
+pop.h