diff --git a/src/Messages.sh b/src/Messages.sh
index 474eb2432..0c019b162 100644
--- a/src/Messages.sh
+++ b/src/Messages.sh
@@ -1,2 +1,2 @@
 #! /bin/sh
-$EXTRACT_TR_STRINGS `find . -name '*.cpp' -o -name '*.h' -o -name '*.ui' | grep -v '/plugins/'` -o $podir/falkon_qt.pot
+$EXTRACT_TR_STRINGS `find . -name '*.cpp' -o -name '*.h' -o -name '*.ui' | grep -v -e '/plugins/' -e '/scripts/'` -o $podir/falkon_qt.pot
diff --git a/src/lib/data/html/start.html b/src/lib/data/html/start.html
index 89552d028..db3f4b576 100644
--- a/src/lib/data/html/start.html
+++ b/src/lib/data/html/start.html
@@ -20,7 +20,7 @@ img {margin-bottom:15px;}
 <img src="%ABOUT-IMG%" width="250">
 %PRIVATE-BROWSING%
 <form action="https://duckduckgo.com/" method="GET">
-    <input type="hidden" name="t" value="falkon" />
+    <input type="hidden" name="t" value="qupzilla" />
     <input class="line" id="inp" class="question" name="q"/> <br/>
     <input class="submit" type="submit" value="%BUTTON-LABEL%">
 </form>
diff --git a/src/scripts/CMakeLists.txt b/src/scripts/CMakeLists.txt
index d7eda83b7..76e9f885d 100644
--- a/src/scripts/CMakeLists.txt
+++ b/src/scripts/CMakeLists.txt
@@ -1,6 +1,10 @@
 function(install_python_script name)
     if (ENABLE_PYTHON_PLUGINS)
-        install(DIRECTORY ${name} DESTINATION "${FALKON_INSTALL_PLUGINDIR}/python")
+        install(
+            DIRECTORY ${name}
+            DESTINATION "${FALKON_INSTALL_PLUGINDIR}/python"
+            FILES_MATCHING PATTERN "*" PATTERN "Messages.sh" EXCLUDE
+        )
         install(FILES i18n.py DESTINATION "${FALKON_INSTALL_PLUGINDIR}/python/${name}")
     endif()
 endfunction()
diff --git a/src/scripts/Messages.sh b/src/scripts/hellopython/Messages.sh
similarity index 50%
rename from src/scripts/Messages.sh
rename to src/scripts/hellopython/Messages.sh
index 17f258b72..29b907a43 100644
--- a/src/scripts/Messages.sh
+++ b/src/scripts/hellopython/Messages.sh
@@ -8,11 +8,4 @@ XGETTEXT_FLAGS_PYTHON="\
 -ki18n:1 -ki18np:1,2 \
 "
 
-python_scripts="
-hellopython
-runaction
-"
-
-for script in $python_scripts; do
-    $XGETTEXT_PROGRAM $XGETTEXT_FLAGS_PYTHON `find $script -name '*.py'` -o $podir/falkon_$script.pot
-done
+$XGETTEXT_PROGRAM $XGETTEXT_FLAGS_PYTHON `find . -name '*.py'` -o $podir/falkon_hellopython.pot
diff --git a/src/scripts/runaction/Messages.sh b/src/scripts/runaction/Messages.sh
new file mode 100644
index 000000000..64d0f33a4
--- /dev/null
+++ b/src/scripts/runaction/Messages.sh
@@ -0,0 +1,11 @@
+#! /bin/sh
+
+XGETTEXT_FLAGS_PYTHON="\
+--copyright-holder=This_file_is_part_of_KDE \
+--msgid-bugs-address=http://bugs.kde.org \
+--from-code=UTF-8 \
+-L Python \
+-ki18n:1 -ki18np:1,2 \
+"
+
+$XGETTEXT_PROGRAM $XGETTEXT_FLAGS_PYTHON `find . -name '*.py'` -o $podir/falkon_runaction.pot