diff --git a/po/Makefile b/po/Makefile
index 6be0aeab40309478cd2b5d4c0fec3e2f6b8f4925..438a614880d8704e82de4ae3856f40230018ba07 100644
--- a/po/Makefile
+++ b/po/Makefile
@@ -3,6 +3,9 @@ LANGS   := fr pt el pl es ru bg de nb cs nl pt_BR sv it eu sk no zh_CN br eo
 LANGS_PO:=$(foreach LANG, ${LANGS}, ${LANG}.po)
 LANGS_MO:=$(foreach LANG, ${LANGS}, ${LANG}.mo)
 DATADIR:=$(subst //,/,${DESTDIR}/${PREFIX}/share)
+GLADESRC=$(wildcard ../data/glade/*.glade)
+PYSRC=$(wildcard ../src/*py ../src/common/*py)
+POTSRC:=../gajim.desktop.in $(foreach FILE, ${GLADESRC}, ${FILE}.h) $(PYSRC)
 
 all: $(LANGS_MO)
 
@@ -12,52 +15,10 @@ all: $(LANGS_MO)
 %.glade.h: %.glade
 	intltool-extract --type=gettext/glade $<
 
-gajim.pot: ../src/*py ../src/common/*py \
-			../data/glade/account_context_menu.glade.h \
-			../data/glade/account_creation_wizard_window.glade.h \
-			../data/glade/account_modification_window.glade.h \
-			../data/glade/accounts_window.glade.h \
-			../data/glade/add_new_contact_window.glade.h \
-			../data/glade/advanced_configuration_window.glade.h \
-			../data/glade/advanced_menuitem_menu.glade.h \
-			../data/glade/advanced_notifications_window.glade.h \
-			../data/glade/change_password_dialog.glade.h \
-			../data/glade/change_status_message_dialog.glade.h \
-			../data/glade/chat_context_menu.glade.h \
-			../data/glade/chat_control_popup_menu.glade.h \
-			../data/glade/choose_gpg_key_dialog.glade.h \
-			../data/glade/data_form_window.glade.h \
-			../data/glade/edit_groups_dialog.glade.h \
-			../data/glade/filetransfers.glade.h \
-			../data/glade/gajim_themes_window.glade.h \
-			../data/glade/gc_control_popup_menu.glade.h \
-			../data/glade/gc_occupants_menu.glade.h \
-			../data/glade/history_manager.glade.h \
-			../data/glade/history_window.glade.h \
-			../data/glade/input_dialog.glade.h \
-			../data/glade/invitation_received_dialog.glade.h \
-			../data/glade/join_groupchat_window.glade.h \
-			../data/glade/manage_accounts_window.glade.h \
-			../data/glade/manage_bookmarks_window.glade.h \
-			../data/glade/manage_proxies_window.glade.h \
-			../data/glade/message_window.glade.h \
-			../data/glade/passphrase_dialog.glade.h \
-			../data/glade/popup_notification_window.glade.h \
-			../data/glade/preferences_window.glade.h \
-			../data/glade/privacy_list_window.glade.h \
-			../data/glade/privacy_lists_window.glade.h \
-			../data/glade/profile_window.glade.h \
-			../data/glade/progress_dialog.glade.h \
-			../data/glade/remove_account_window.glade.h \
-			../data/glade/roster_contact_context_menu.glade.h \
-			../data/glade/roster_window.glade.h \
-			../data/glade/service_discovery_window.glade.h \
-			../data/glade/service_registration_window.glade.h \
-			../data/glade/single_message_window.glade.h \
-			../data/glade/subscription_request_window.glade.h \
-			../data/glade/systray_context_menu.glade.h \
-			../data/glade/vcard_information_window.glade.h \
-			../data/glade/xml_console_window.glade.h
+POTFILES.in: $(POTSRC)
+	echo -e "# generated by make POTFILES.in\n[encoding: UTF-8]" $(subst ../,\\n,$^) "\n" >POTFILES.in
+
+gajim.pot: POTFILES.in
 	intltool-update --pot --gettext-package=$(NAME)
 
 install:
diff --git a/po/POTFILES.in b/po/POTFILES.in
deleted file mode 100644
index fa1a11b6e08bbabe8cd3ec7fc9f563334961d8b8..0000000000000000000000000000000000000000
--- a/po/POTFILES.in
+++ /dev/null
@@ -1,92 +0,0 @@
-# ls gajim.desktop.in src/gtkgui.glade.h src/history_manager.glade.h 
-# src/*py src/common/*py -1 -U in trunk
-# to produce this list
-
-[encoding: UTF-8]
-gajim.desktop.in
-data/glade/account_context_menu.glade.h
-data/glade/account_creation_wizard_window.glade.h
-data/glade/account_modification_window.glade.h
-data/glade/accounts_window.glade.h
-data/glade/add_new_contact_window.glade.h
-data/glade/advanced_configuration_window.glade.h
-data/glade/advanced_menuitem_menu.glade.h
-data/glade/advanced_notifications_window.glade.h
-data/glade/change_password_dialog.glade.h
-data/glade/change_status_message_dialog.glade.h
-data/glade/chat_context_menu.glade.h
-data/glade/chat_control_popup_menu.glade.h
-data/glade/choose_gpg_key_dialog.glade.h
-data/glade/data_form_window.glade.h
-data/glade/edit_groups_dialog.glade.h
-data/glade/filetransfers.glade.h
-data/glade/gajim_themes_window.glade.h
-data/glade/gc_control_popup_menu.glade.h
-data/glade/gc_occupants_menu.glade.h
-data/glade/history_manager.glade.h
-data/glade/history_window.glade.h
-data/glade/input_dialog.glade.h
-data/glade/invitation_received_dialog.glade.h
-data/glade/join_groupchat_window.glade.h
-data/glade/manage_accounts_window.glade.h
-data/glade/manage_bookmarks_window.glade.h
-data/glade/manage_proxies_window.glade.h
-data/glade/message_window.glade.h
-data/glade/passphrase_dialog.glade.h
-data/glade/popup_notification_window.glade.h
-data/glade/preferences_window.glade.h
-data/glade/privacy_list_window.glade.h
-data/glade/privacy_lists_window.glade.h
-data/glade/profile_window.glade.h
-data/glade/progress_dialog.glade.h
-data/glade/remove_account_window.glade.h
-data/glade/roster_contact_context_menu.glade.h
-data/glade/roster_window.glade.h
-data/glade/service_discovery_window.glade.h
-data/glade/service_registration_window.glade.h
-data/glade/single_message_window.glade.h
-data/glade/subscription_request_window.glade.h
-data/glade/systray_context_menu.glade.h
-data/glade/vcard_information_window.glade.h
-data/glade/xml_console_window.glade.h
-src/advanced.py
-src/cell_renderer_image.py
-src/chat_control.py
-src/config.py
-src/conversation_textview.py
-src/dbus_support.py
-src/dialogs.py
-src/disco.py
-src/filetransfers_window.py
-src/gajim-remote.py
-src/gajim.py
-src/gajim_themes_window.py
-src/groupchat_control.py
-src/gtkexcepthook.py
-src/gtkgui_helpers.py
-src/history_manager.py
-src/history_window.py
-src/message_control.py
-src/message_textview.py
-src/message_window.py
-src/notify.py
-src/remote_control.py
-src/roster_window.py
-src/systray.py
-src/systraywin32.py
-src/tooltips.py
-src/vcard.py
-src/common/check_paths.py
-src/common/exceptions.py
-src/common/GnuPG.py
-src/common/GnuPGInterface.py
-src/common/config.py
-src/common/connection.py
-src/common/connection_handlers.py
-src/common/gajim.py
-src/common/helpers.py
-src/common/i18n.py
-src/common/logger.py
-src/common/optparser.py
-src/common/sleepy.py
-src/common/socks5.py