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