diff --git a/make-gnucash-potfiles.in b/make-gnucash-potfiles.in
index 919cfc4b28..ae4b1aa1b4 100644
--- a/make-gnucash-potfiles.in
+++ b/make-gnucash-potfiles.in
@@ -27,9 +27,11 @@ while (<IN>) {
 close IN;
 
 
-my @possible_files = `cd @-SRCDIR-@ && find src -name '*.c' -o -name '*.glade' \\
+my @possible_files = `cd @-SRCDIR-@ && find src -name '*.c' \\
+                      -o -name '*.cpp' -o -name '*.glade' \\
                       -o -name '*.desktop.in' -o -name '*.keys.in' \\
-                      -o -name '*.gschema.xml.in.in' |sort`;
+                      -o -name '*.gschema.xml.in.in' \\
+                      | sort`;
 ## For perl files add the following:
 # -o -name '*.pl'
 
diff --git a/po/POTFILES.skip b/po/POTFILES.skip
index a3d3331af2..0bfdc583f3 100644
--- a/po/POTFILES.skip
+++ b/po/POTFILES.skip
@@ -19,6 +19,10 @@ src/libqof/qof/qofquery-deserial.c
 src/libqof/qof/qofquery-serialize.c
 src/libqof/qof/qofsql.c
 
+# These we don't want to translate because they're experimental:
+src/gnc/.*
+src/optional/gtkmm/.*
+
 # The scheme files are handled by intl-scm/guile-strings.c because
 # intltool wouldn't scan scheme files. They're here now because
 # intltool 0.50 *does* scan them, and it creates an error during make