diff --git a/src/Messages.sh b/src/Messages.sh
new file mode 100644
index 000000000..0fb591f29
--- /dev/null
+++ b/src/Messages.sh
@@ -0,0 +1,11 @@
+#!/bin/sh
+
+# Invoke the extractrc script on all .ui, .rc, and .kcfg files in the sources.
+# The results are stored in a pseudo .cpp file to be picked up by xgettext.
+lst=`find . -name \*.rc -o -name \*.ui -o -name \*.kcfg`
+if [ -n "$lst" ] ; then
+    $EXTRACTRC $lst >> rc.cpp
+fi
+
+# Run xgettext to extract strings from all source files.
+$XGETTEXT `find . -name \*.cpp -o -name \*.h -o -name \*.qml` -o $podir/libplasma5.pot
diff --git a/src/plasma/Messages.sh b/src/plasma/Messages.sh
deleted file mode 100644
index 224ecee37..000000000
--- a/src/plasma/Messages.sh
+++ /dev/null
@@ -1,4 +0,0 @@
-#! /usr/bin/env bash
-$EXTRACTRC private/*.ui >> rc.cpp
-$XGETTEXT `ls *.cpp *.h */*.h */*.cpp | grep -v 'tests/'` -o $podir/libplasma.pot
-rm -f *.ui
diff --git a/src/plasmapkg/Messages.sh b/src/plasmapkg/Messages.sh
deleted file mode 100755
index c6173cdac..000000000
--- a/src/plasmapkg/Messages.sh
+++ /dev/null
@@ -1,2 +0,0 @@
-#! /usr/bin/env bash
-$XGETTEXT *.cpp -o $podir/plasmapkg.pot
diff --git a/src/scriptengines/qml/Messages.sh b/src/scriptengines/qml/Messages.sh
deleted file mode 100644
index 9ade13ac2..000000000
--- a/src/scriptengines/qml/Messages.sh
+++ /dev/null
@@ -1,2 +0,0 @@
-#! /usr/bin/env bash
-$XGETTEXT `find . -name '*.cpp'` -o $podir/plasma_scriptengine_declarative.pot