diff --git a/po/genpot.sh b/po/genpot.sh
index 6f12a24c6..51088c713 100755
--- a/po/genpot.sh
+++ b/po/genpot.sh
@@ -1,3 +1,8 @@
 #!/bin/sh
-# Make translation files (keywords issues, see bug #6595)
-# intltool-update -g gramps -o gramps.pot -p
+# $Id$
+
+# Make translation files
+
+# additional keywords must always be kept in sync with those in update_po.py
+XGETTEXT_ARGS='--keyword=_T_ --keyword=trans_text_ --keyword=_ngettext' \
+  intltool-update -g gramps -o gramps.pot -p
diff --git a/po/update_po.py b/po/update_po.py
index 3b84169fa..f5ea6057b 100644
--- a/po/update_po.py
+++ b/po/update_po.py
@@ -20,6 +20,8 @@
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+#
+# $Id$
 
 """
 update_po.py for Gramps translations.
@@ -576,6 +578,7 @@ def retrieve():
     create_filesfile()
     listing('python.txt', ['.py', '.py.in'])
     
+    # additional keywords must always be kept in sync with those in genpot.sh
     os.system('''%(xgettext)s -j --directory=./ -d gramps '''
               '''-L Python -o gramps.pot --files-from=python.txt '''
               '''--keyword=_ --keyword=ngettext '''