diff --git a/autogen.sh b/autogen.sh
index 7297cd48305600d54a4fd31f70e0c52ced9b9cdc..a187d9e9202026dd07eafc3604f270d312c375f5 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -20,8 +20,10 @@
   && for p in `ls data/gui/*.ui`; do echo "[type: gettext/glade]$p" >> \
   po/POTFILES.in; done \
   && ls -1 data/gajim.desktop.in.in \
-  src/*py src/common/*py src/common/zeroconf/*.py src/plugins/*.py| grep -v ipython_view.py >> \
-  po/POTFILES.in || exit 1
+  src/*.py src/common/*.py src/command_system/implementation/*.py src/common/zeroconf/*.py src/plugins/*.py | grep -v ipython_view.py >> \
+  po/POTFILES.in \
+  && echo -e "data/gajim.desktop.in\nsrc/ipython_view.py" > po/POTFILES.skip \
+  && ls -1 plugins/*/*.py plugins/*/*.ui >> po/POTFILES.skip || exit 1
   if test -z `which pkg-config 2>/dev/null`;then
     echo "***Error: pkg-config not found***"
 	echo "See README.html for build requirements."
diff --git a/po/POTFILES.skip b/po/POTFILES.skip
deleted file mode 100644
index 26c1c02d197c09a98ec896b4f085d7632bc1b6d8..0000000000000000000000000000000000000000
--- a/po/POTFILES.skip
+++ /dev/null
@@ -1,3 +0,0 @@
-data/gajim.desktop.in
-src/eggtrayicon.c
-src/ipython_view.py