diff --git a/completion/bash-completion b/completion/bash-completion
index ae47746e..5916c669 100644
--- a/completion/bash-completion
+++ b/completion/bash-completion
@@ -128,8 +128,8 @@ __complete_install() {
 
 __complete_update() {
 	opts="-h -c -v -q -b -i -I -e -w"
-	lopts="--help --createmeta --verbose --quiet --buildreport --interactive
- --icons --editor --wiki --pretty --clean --delete-unknown"
+	lopts="--help --create-metadata --verbose --quiet --buildreport
+ --interactive --icons --editor --wiki --pretty --clean --delete-unknown"
 	case "${prev}" in
 		-e|--editor)
 			_filedir
diff --git a/fdroidserver/update.py b/fdroidserver/update.py
index c2679ca8..faf18ba6 100644
--- a/fdroidserver/update.py
+++ b/fdroidserver/update.py
@@ -882,7 +882,7 @@ def main():
 
     # Parse command line...
     parser = OptionParser()
-    parser.add_option("-c", "--createmeta", action="store_true", default=False,
+    parser.add_option("-c", "--create-metadata", action="store_true", default=False,
                       help="Create skeleton metadata files that are missing")
     parser.add_option("--delete-unknown", action="store_true", default=False,
                       help="Delete APKs without metadata from the repo")
@@ -957,7 +957,7 @@ def main():
                 found = True
                 break
         if not found:
-            if options.createmeta:
+            if options.create_metadata:
                 f = open(os.path.join('metadata', apk['id'] + '.txt'), 'w')
                 f.write("License:Unknown\n")
                 f.write("Web Site:\n")
diff --git a/tests/run-tests b/tests/run-tests
index f5e60057..206ffa6b 100755
--- a/tests/run-tests
+++ b/tests/run-tests
@@ -51,7 +51,7 @@ REPOROOT=`create_test_dir`
 cd $REPOROOT
 $fdroid init
 copy_apks_into_repo $REPOROOT
-$fdroid update --createmeta
+$fdroid update --create-metadata
 grep -F '<application id=' repo/index.xml
 
 
@@ -138,7 +138,7 @@ cd $REPOROOT
 $fdroid init --keystore $KEYSTORE --android-home $FAKE_ANDROID_HOME --no-prompt
 test -e $KEYSTORE
 copy_apks_into_repo $REPOROOT
-$fdroid update --createmeta
+$fdroid update --create-metadata
 grep -F '<application id=' repo/index.xml
 test -e repo/index.xml
 test -e repo/index.jar
@@ -153,7 +153,7 @@ cd $REPOROOT
 mkdir repo
 copy_apks_into_repo $REPOROOT
 $fdroid init
-$fdroid update --createmeta
+$fdroid update --create-metadata
 grep -F '<application id=' repo/index.xml
 
 
@@ -166,7 +166,7 @@ cd $REPOROOT
 $fdroid init --keystore $KEYSTORE
 test -e $KEYSTORE
 copy_apks_into_repo $REPOROOT
-$fdroid update --createmeta
+$fdroid update --create-metadata
 test -e repo/index.xml
 test -e repo/index.jar
 grep -F '<application id=' repo/index.xml
@@ -181,12 +181,12 @@ cd $REPOROOT
 $fdroid init --keystore $KEYSTORE
 test -e $KEYSTORE
 copy_apks_into_repo $REPOROOT
-$fdroid update --createmeta
+$fdroid update --create-metadata
 test -e repo/index.xml
 test -e repo/index.jar
 grep -F '<application id=' repo/index.xml
 cp $WORKSPACE/tests/urzip.apk $REPOROOT/
-$fdroid update --createmeta
+$fdroid update --create-metadata
 test -e repo/index.xml
 test -e repo/index.jar
 grep -F '<application id=' repo/index.xml