diff --git a/fdroid.py b/fdroid.py
new file mode 100755
index 00000000..6aea70f0
--- /dev/null
+++ b/fdroid.py
@@ -0,0 +1,54 @@
+#!/usr/bin/python
+# -*- coding: utf-8 -*-
+#
+# fdroid.py - part of the FDroid server tools
+# Copyright (C) 2010-12, Ciaran Gultnieks, ciaran@ciarang.com
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Affero General Public License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+import sys
+
+commands = [
+        "build",
+        "update",
+        "checkupdates",
+        "import",
+        "rewritemeta",
+        "scanner",
+        "statsupdate"]
+
+def main():
+
+    if len(sys.argv) <= 1:
+        print "Specify a command. Valid commands are:"
+        for command in commands:
+            print "  " + command
+        sys.exit(0)
+
+    command = sys.argv[1]
+    if not command in commands:
+        print "Command '" + command + "' not recognised"
+        sys.exit(1)
+
+    # Trick optparse into displaying the right usage when --help is used.
+    sys.argv[0] += ' ' + command
+
+    del sys.argv[1]
+    mod = __import__(command)
+    mod.main()
+    sys.exit(0)
+
+if __name__ == "__main__":
+    main()
+
diff --git a/metadata/org.pocketworkstation.pckeyboard.txt b/metadata/org.pocketworkstation.pckeyboard.txt
index 47019309..9a81ce4b 100644
--- a/metadata/org.pocketworkstation.pckeyboard.txt
+++ b/metadata/org.pocketworkstation.pckeyboard.txt
@@ -17,8 +17,9 @@ Build Version:v1.18,1018,8298cd8728c2,subdir=java,target=android-11,buildjni=yes
 Build Version:v1.20,1020,e703fa82a4c3,subdir=java,target=android-11,buildjni=yes
 Build Version:v1.22,1022,154e21230e81,subdir=java,target=android-11,buildjni=yes
 Build Version:v1.29,1029,1.29,subdir=java,target=android-11,buildjni=yes,prebuild=./AutoVersion.sh
+Build Version:v1.31,1031,065ed34b811c,subdir=java,target=android-11,buildjni=yes,prebuild=sed -i "s/Hg-ident/hg ident/" AutoVersion.sh && ./AutoVersion.sh
 
 Update Check Mode:Market
-Current Version:v1.29
-Current Version Code:1029
+Current Version:v1.31
+Current Version Code:1031
 
diff --git a/updatestats.py b/stats.py
similarity index 100%
rename from updatestats.py
rename to stats.py