diff --git a/autogen.sh b/autogen.sh
index 9502c37e2..4d65142e8 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -1,4 +1,5 @@
 #!/bin/sh
+set -x
   intltoolize --force --automake \
   && aclocal -I ./m4 \
   && libtoolize --copy --force --automake \
diff --git a/configure b/configure
index 71b4b8af7..040e86a53 100755
--- a/configure
+++ b/configure
@@ -22002,7 +22002,6 @@ cat >>confdefs.h <<_ACEOF
 #define GETTEXT_PACKAGE "$GETTEXT_PACKAGE"
 _ACEOF
 
-ALL_LINGUAS="fr pt el pl es ru bg de nb cs nl pt_BR sv it eu sk no zh_CN br eo"
 
 
 for ac_header in locale.h
diff --git a/configure.ac b/configure.ac
index 689392671..3ab972e34 100644
--- a/configure.ac
+++ b/configure.ac
@@ -24,7 +24,6 @@ AC_PATH_X
 GETTEXT_PACKAGE=gajim
 AC_SUBST([GETTEXT_PACKAGE])
 AC_DEFINE_UNQUOTED([GETTEXT_PACKAGE],["$GETTEXT_PACKAGE"], [Gettext package])
-ALL_LINGUAS="fr pt el pl es ru bg de nb cs nl pt_BR sv it eu sk no zh_CN br eo"
 AM_GLIB_GNU_GETTEXT
 AM_NLS
 
diff --git a/data/Makefile.am b/data/Makefile.am
index 43f1bb6e8..d57cd6a13 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -1,4 +1,5 @@
 SUBDIRS = glade emoticons pixmaps iconsets 
+@INTLTOOL_DESKTOP_RULE@
 
 desktopdir = $(datadir)/applications
 desktop_in_files = gajim.desktop.in.in 
@@ -7,12 +8,11 @@ desktop_DATA = $(desktop_in_files:.desktop.in.in=.desktop)
 soundsdir = $(pkgdatadir)/data/sounds
 sounds_DATA = $(srcdir)/sounds/*.wav
 
-otherdir = $(pkgdatadir)/data/others
+otherdir = $(pkgdatadir)/data/other
 other_DATA = other/servers.xml
 
 man_MANS = gajim.1 gajim-remote.1
 
-@INTLTOOL_DESKTOP_RULE@
 
 EXTRA_DIST = $(desktop_in_files) \
 			 $(sounds_DATA) \
@@ -21,3 +21,4 @@ EXTRA_DIST = $(desktop_in_files) \
 
 DISTCLEANFILES = $(desktop_DATA)
 
+CLEANFILES = gajim.desktop
diff --git a/data/Makefile.in b/data/Makefile.in
index 3e0e22fca..6ee916d94 100644
--- a/data/Makefile.in
+++ b/data/Makefile.in
@@ -257,7 +257,7 @@ desktop_in_files = gajim.desktop.in.in
 desktop_DATA = $(desktop_in_files:.desktop.in.in=.desktop)
 soundsdir = $(pkgdatadir)/data/sounds
 sounds_DATA = $(srcdir)/sounds/*.wav
-otherdir = $(pkgdatadir)/data/others
+otherdir = $(pkgdatadir)/data/other
 other_DATA = other/servers.xml
 man_MANS = gajim.1 gajim-remote.1
 EXTRA_DIST = $(desktop_in_files) \
@@ -266,6 +266,7 @@ EXTRA_DIST = $(desktop_in_files) \
 			 $(man_MANS)
 
 DISTCLEANFILES = $(desktop_DATA)
+CLEANFILES = gajim.desktop
 all: all-recursive
 
 .SUFFIXES:
@@ -607,6 +608,7 @@ install-strip:
 mostlyclean-generic:
 
 clean-generic:
+	-test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
 
 distclean-generic:
 	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
@@ -684,7 +686,6 @@ uninstall-man: uninstall-man1
 	uninstall-desktopDATA uninstall-info-am uninstall-man \
 	uninstall-man1 uninstall-otherDATA uninstall-soundsDATA
 
-
 @INTLTOOL_DESKTOP_RULE@
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
diff --git a/po/LINGUAS b/po/LINGUAS
new file mode 100644
index 000000000..86c6f8b9b
--- /dev/null
+++ b/po/LINGUAS
@@ -0,0 +1,2 @@
+# available languages
+fr pt el pl es ru bg de nb cs nl pt_BR sv it eu sk no zh_CN br eo