diff --git a/CMakeLists.txt b/CMakeLists.txt
index c954f0e..81095da 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -388,7 +388,7 @@ add_custom_command (TARGET translation
 install (TARGETS xqf DESTINATION "${CMAKE_INSTALL_PREFIX}/bin")
 
 # Query script
-install (PROGRAMS ${CMAKE_SOURCE_DIR}/src/script/qstat_savage.sh DESTINATION "${PACKAGE_DATA_DIR}/script")
+install (PROGRAMS ${CMAKE_SOURCE_DIR}/scripts/qstat_savage.sh DESTINATION "${PACKAGE_DATA_DIR}/scripts")
 
 # UI
 if (GUI MATCHES GTK2)
diff --git a/pot_generator.sh b/pot_generator.sh
deleted file mode 100755
index b0ab631..0000000
--- a/pot_generator.sh
+++ /dev/null
@@ -1,11 +0,0 @@
-#!/bin/sh
-
-#
-# This script automatically updates translation template from
-# the source code of XQF
-#
-POT=po/xqf.pot
-VERSION=$(git describe --abbrev=0 --tags)
-
-find ./ -name '*.c' -o -name '*.ui' -o -name 'xqf.desktop.in' | sort | xgettext \
-\--from-code=UTF-8 --package-name="XQF" --copyright-holder="XQF Team" --msgid-bugs-address="https://github.com/xqf/xqf/issues" --no-location --package-version="${VERSION}" -o ${POT} -k_ -kN_ -f -
diff --git a/docs/convertmaxmindflags b/scripts/convertmaxmindflags
similarity index 100%
rename from docs/convertmaxmindflags
rename to scripts/convertmaxmindflags
diff --git a/docs/copykdeflags b/scripts/copykdeflags
similarity index 100%
rename from docs/copykdeflags
rename to scripts/copykdeflags
diff --git a/scripts/pot_generator.sh b/scripts/pot_generator.sh
new file mode 100755
index 0000000..d93af15
--- /dev/null
+++ b/scripts/pot_generator.sh
@@ -0,0 +1,30 @@
+#! /bin/sh
+
+#
+# This script automatically updates translation template from the source code of XQF
+#
+
+if [ "x${1}" = 'x-h' -o "x${1}" = 'x--help' -o "x${1}" = 'x' ]
+then
+	echo "Usage: ${0} [XQF's source root directory]"
+	exit
+fi
+		
+POT="${1}/po/xqf.pot"
+VERSION="$(git describe --abbrev=0 --tags)"
+
+find "${1}" -name '*.c' -o -name '*.ui' -o -name 'xqf.desktop.in' \
+	| sort \
+	| xgettext \
+		--from-code='UTF-8' \
+		--package-name='XQF' \
+		--copyright-holder='XQF Team' \
+		--msgid-bugs-address='https://github.com/xqf/xqf/issues' \
+		--no-location \
+		--package-version="${VERSION}" \
+		-o "${POT}" \
+		-k'_' \
+		-k'N_' \
+		-f -
+
+#EOF
diff --git a/src/script/qstat_savage.sh b/scripts/qstat_savage.sh
similarity index 100%
rename from src/script/qstat_savage.sh
rename to scripts/qstat_savage.sh
diff --git a/src/stat.c b/src/stat.c
index 64cf9d7..2cdaf57 100644
--- a/src/stat.c
+++ b/src/stat.c
@@ -1060,7 +1060,7 @@ static struct stat_conn *stat_update_master_qstat (struct stat_job *job, struct
 
 		/* savage hack */
 		if (m->type == SAS_SERVER) {
-			argv[argi++] = PACKAGE_DATA_DIR "/script/qstat_savage.sh";
+			argv[argi++] = PACKAGE_DATA_DIR "/scripts/qstat_savage.sh";
 			argv[argi++] = "-sam";
 			argv[argi++] = m->url;
 			argv[argi++] = NULL;