diff --git a/util/run_xgettext.sh b/util/run_xgettext.sh
old mode 100644
new mode 100755
index 2cfaca4870..9d38e4da9c
--- a/util/run_xgettext.sh
+++ b/util/run_xgettext.sh
@@ -1,26 +1,36 @@
 #!/bin/bash
 
-cd $(dirname $0)
+FULLPATH=$(dirname $(readlink -f "$0"))
+cd "$FULLPATH/../view/en/"
+
+F9KVERSION=$(sed -n "s/.*'FRIENDIKA_VERSION'.*'\([0-9.]*\)'.*/\1/p" ../../boot.php);
+
+echo "Friendika version $F9KVERSION"
 
 OPTS=
-
-if [ -e "$1" ]
+OUTFILE="$FULLPATH/messages.po"
+if [ "" != "$1" ]
 then
-	OPTS="-j -o $1"
+	OUTFILE="$(readlink -f ${FULLPATH}/$1)"
+	if [ -e "$OUTFILE" ]
+	then
+		echo "join extracted strings"
+		OPTS="-j"
+	fi
 fi
 
 KEYWORDS="-k -kt -ktt:1,2"
 
-find .. -name "*.php" | xargs xgettext $KEYWORDS $OPTS --from-code=UTF-8
+echo "extract strings to $OUTFILE.."
+find ../../ -name "*.php" | xargs xgettext $KEYWORDS $OPTS -o "$OUTFILE" --from-code=UTF-8
 
-F9KVERSION=$(sed -n "s/.*'FRIENDIKA_VERSION'.*'\([0-9.]*\)'.*/\1/p" ../boot.php); 
+echo "setup base info.."
+sed -i "s/SOME DESCRIPTIVE TITLE./FRIENDIKA Distribuited Social Network/g" "$OUTFILE"
+sed -i "s/YEAR THE PACKAGE'S COPYRIGHT HOLDER/2010, 2011 Mike Macgirvin/g" "$OUTFILE"
+sed -i "s/FIRST AUTHOR <EMAIL@ADDRESS>, YEAR./Mike Macgirvin, 2010/g" "$OUTFILE"
+sed -i "s/PACKAGE VERSION/$F9KVERSION/g" "$OUTFILE"
+sed -i "s/PACKAGE/Friendika/g" "$OUTFILE"
+sed -i "s/CHARSET/UTF-8/g" "$OUTFILE"
 
 
-sed -i "s/SOME DESCRIPTIVE TITLE./FRIENDIKA Distribuited Social Network/g" messages.po
-sed -i "s/YEAR THE PACKAGE'S COPYRIGHT HOLDER/2010, 2011 Mike Macgirvin/g" messages.po
-sed -i "s/FIRST AUTHOR <EMAIL@ADDRESS>, YEAR./Mike Macgirvin, 2010/g" messages.po
-sed -i "s/PACKAGE VERSION/$F9KVERSION/g" messages.po
-sed -i "s/PACKAGE/Friendika/g" messages.po
-sed -i "s/CHARSET/UTF-8/g" messages.po
-sed -i "s|#: \.\./|#: ../../|g" messages.po
-
+echo "done."
\ No newline at end of file