diff --git a/POTDIRS b/POTDIRS
new file mode 100644
index 0000000000..0f8298b6e8
--- /dev/null
+++ b/POTDIRS
@@ -0,0 +1,16 @@
+kicad
+pcbnew
+common
+eeschema
+cvpcb
+3d-viewer
+gerbview
+bitmap2component
+new
+polygon
+pcb_calculator
+potrace
+tools
+pagelayout_editor
+include
+lib_dxf
diff --git a/POTFILES.in b/POTFILES.in
deleted file mode 100644
index 54573b8825..0000000000
--- a/POTFILES.in
+++ /dev/null
@@ -1,41 +0,0 @@
-#Add sources that contains translatable strings here:
-
-#kicad
-kicad/class_treeproject_item.cpp
-kicad/commandframe.cpp
-kicad/dialogs/dialog_template_selector.cpp
-kicad/dialogs/dialog_template_selector_base.h
-kicad/dialogs/dialog_template_selector_base.cpp
-kicad/files-io.cpp
-kicad/mainframe.cpp
-kicad/menubar.cpp
-kicad/preferences.cpp
-kicad/prjconfig.cpp
-kicad/tree_project_frame.cpp
-kicad/menubar.cppstatic
-
-#pcbnew
-
-#common
-
-#eeschema
-
-#cvpcb
-
-#3d-viewer
-
-#gerbview
-
-#bitmap2component
-
-#new
-
-#polygon
-
-#pcb_calculator
-
-#potrace
-
-#tools
-
-#pagelayout_editor
diff --git a/update-po-files.sh b/update-po-files.sh
new file mode 100755
index 0000000000..5b4530e13e
--- /dev/null
+++ b/update-po-files.sh
@@ -0,0 +1,41 @@
+#!/bin/bash
+#####################################
+#
+# This program source code file is part of KiCad, a free EDA CAD application.
+#
+# Copyright (C) 2015 Marco Ciampa <ciampix@libero.it>
+# Copyright (C) 2015 KiCAd Developers
+#
+# License GNU GPL Version 3 or any later version.
+#
+#####################################
+
+SOURCEDIR=../kicad-source-mirror #Set this first!!!
+
+#Autovars
+LOCALDIR=$PWD
+LINGUAS=`cat LINGUAS|grep -v '^#'|grep -v '^\s*$'` #Read file without comment and empty lines
+POTDIRS=`cat POTDIRS|grep -v '^#'|grep -v '^\s*$'` #Read file without comment and empty lines
+
+cd $SOURCEDIR
+
+#Generate source file list
+for f in $POTDIRS
+do
+  find $f -name "*.cpp" >>$LOCALDIR/POTFILES #List files
+  find $f -name "*.h"   >>$LOCALDIR/POTFILES #List files
+done
+
+#Generate/update template pot file
+xgettext -f $LOCALDIR/POTFILES -k_ -k_HKI --force-po --from-code utf-8 -o $LOCALDIR/kicad.pot
+
+rm $LOCALDIR/POTFILES
+
+for i in $LINGUAS
+do
+  msgmerge --force-po $LOCALDIR/$i/kicad.po $LOCALDIR/kicad.pot -o $LOCALDIR/$i/kicad.po 2>&1 # >> /dev/null
+#  msgfmt --statistics $LOCALDIR/$i/kicad.po 2>&1 >>/dev/null
+done
+
+#Comment this to create new language template
+rm $LOCALDIR/kicad.pot