diff --git a/configure.ac b/configure.ac
index cf60fa8cda..904b47ca15 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2193,11 +2193,18 @@ desktop/gimp.desktop.in
 etc/Makefile
 m4macros/Makefile
 po/Makefile.in
+po/POTFILES.skip
 po-libgimp/Makefile.in
+po-libgimp/POTFILES.skip
 po-plug-ins/Makefile.in
+po-plug-ins/POTFILES.skip
 po-python/Makefile.in
+po-python/POTFILES.skip
 po-script-fu/Makefile.in
+po-script-fu/POTFILES.skip
+po-tags/POTFILES.skip
 po-tips/Makefile.in
+po-tips/POTFILES.skip
 gimp-zip
 Makefile
 ])
diff --git a/po-libgimp/.gitignore b/po-libgimp/.gitignore
index 8178716b61..f42757672d 100644
--- a/po-libgimp/.gitignore
+++ b/po-libgimp/.gitignore
@@ -5,6 +5,7 @@
 /Makefile
 /Makefile.in
 /POTFILES
+/POTFILES.skip
 /messages
 /missing
 /stamp-it
diff --git a/po-libgimp/POTFILES.skip b/po-libgimp/POTFILES.skip.in
similarity index 78%
rename from po-libgimp/POTFILES.skip
rename to po-libgimp/POTFILES.skip.in
index 2d14b64b10..8e377733df 100644
--- a/po-libgimp/POTFILES.skip
+++ b/po-libgimp/POTFILES.skip.in
@@ -3,5 +3,6 @@ data/tags
 data/tips
 desktop
 desktop/gimp.desktop.in
+gimp-@GIMP_VERSION@
 plug-ins
 tools
diff --git a/po-plug-ins/.gitignore b/po-plug-ins/.gitignore
index 8178716b61..f42757672d 100644
--- a/po-plug-ins/.gitignore
+++ b/po-plug-ins/.gitignore
@@ -5,6 +5,7 @@
 /Makefile
 /Makefile.in
 /POTFILES
+/POTFILES.skip
 /messages
 /missing
 /stamp-it
diff --git a/po-plug-ins/POTFILES.skip b/po-plug-ins/POTFILES.skip.in
similarity index 94%
rename from po-plug-ins/POTFILES.skip
rename to po-plug-ins/POTFILES.skip.in
index c2f26c06b5..b8ec769080 100644
--- a/po-plug-ins/POTFILES.skip
+++ b/po-plug-ins/POTFILES.skip.in
@@ -3,6 +3,7 @@ data/tags
 data/tips
 desktop
 desktop/gimp.desktop.in
+gimp-@GIMP_VERSION@
 libgimp
 libgimpbase
 libgimpconfig
diff --git a/po-python/.gitignore b/po-python/.gitignore
index 8178716b61..f42757672d 100644
--- a/po-python/.gitignore
+++ b/po-python/.gitignore
@@ -5,6 +5,7 @@
 /Makefile
 /Makefile.in
 /POTFILES
+/POTFILES.skip
 /messages
 /missing
 /stamp-it
diff --git a/po-python/POTFILES.skip b/po-python/POTFILES.skip.in
similarity index 97%
rename from po-python/POTFILES.skip
rename to po-python/POTFILES.skip.in
index 46d737e4fe..18420ac6b7 100644
--- a/po-python/POTFILES.skip
+++ b/po-python/POTFILES.skip.in
@@ -3,6 +3,7 @@ data/tags
 data/tips
 desktop
 desktop/gimp.desktop.in
+gimp-@GIMP_VERSION@
 libgimp
 libgimpbase
 libgimpconfig
diff --git a/po-script-fu/.gitignore b/po-script-fu/.gitignore
index 8178716b61..f42757672d 100644
--- a/po-script-fu/.gitignore
+++ b/po-script-fu/.gitignore
@@ -5,6 +5,7 @@
 /Makefile
 /Makefile.in
 /POTFILES
+/POTFILES.skip
 /messages
 /missing
 /stamp-it
diff --git a/po-script-fu/POTFILES.skip b/po-script-fu/POTFILES.skip.in
similarity index 97%
rename from po-script-fu/POTFILES.skip
rename to po-script-fu/POTFILES.skip.in
index 53d35a3809..3551ed8004 100644
--- a/po-script-fu/POTFILES.skip
+++ b/po-script-fu/POTFILES.skip.in
@@ -3,6 +3,7 @@ data/tags
 data/tips
 desktop
 desktop/gimp.desktop.in
+gimp-@GIMP_VERSION@
 libgimp
 libgimpbase
 libgimpconfig
diff --git a/po-tags/.gitignore b/po-tags/.gitignore
index ff914d5df4..3ef27966ee 100644
--- a/po-tags/.gitignore
+++ b/po-tags/.gitignore
@@ -2,3 +2,4 @@
 /*.mo
 /*.pot
 /.intltool-merge-cache
+/POTFILES.skip
diff --git a/po-tags/POTFILES.skip b/po-tags/POTFILES.skip.in
similarity index 87%
rename from po-tags/POTFILES.skip
rename to po-tags/POTFILES.skip.in
index bed2f0ceed..f87abea37c 100644
--- a/po-tags/POTFILES.skip
+++ b/po-tags/POTFILES.skip.in
@@ -2,6 +2,7 @@ app
 data/tips
 desktop
 desktop/gimp.desktop.in
+gimp-@GIMP_VERSION@
 libgimp
 libgimpbase
 libgimpconfig
diff --git a/po-tips/.gitignore b/po-tips/.gitignore
index 8178716b61..f42757672d 100644
--- a/po-tips/.gitignore
+++ b/po-tips/.gitignore
@@ -5,6 +5,7 @@
 /Makefile
 /Makefile.in
 /POTFILES
+/POTFILES.skip
 /messages
 /missing
 /stamp-it
diff --git a/po-tips/POTFILES.skip b/po-tips/POTFILES.skip.in
similarity index 87%
rename from po-tips/POTFILES.skip
rename to po-tips/POTFILES.skip.in
index f94378733b..70f3ed97de 100644
--- a/po-tips/POTFILES.skip
+++ b/po-tips/POTFILES.skip.in
@@ -2,6 +2,7 @@ app
 data/tags
 desktop
 desktop/gimp.desktop.in
+gimp-@GIMP_VERSION@
 libgimp
 libgimpbase
 libgimpconfig
diff --git a/po/.gitignore b/po/.gitignore
index a9d7fbaf9c..511fdd415f 100644
--- a/po/.gitignore
+++ b/po/.gitignore
@@ -5,6 +5,7 @@
 /Makefile
 /Makefile.in
 /POTFILES
+/POTFILES.skip
 /messages
 /missing
 /po2tbl.sed.in
diff --git a/po/POTFILES.skip b/po/POTFILES.skip.in
similarity index 91%
rename from po/POTFILES.skip
rename to po/POTFILES.skip.in
index 28eb1abc1e..8efbe5a188 100644
--- a/po/POTFILES.skip
+++ b/po/POTFILES.skip.in
@@ -2,6 +2,7 @@ app/widgets/gtkscalebutton.c
 data/tags/gimp-tags-default.xml.in
 data/tips/gimp-tips.xml.in
 desktop/gimp.desktop.in
+gimp-@GIMP_VERSION@
 libgimp
 libgimpbase
 libgimpconfig