diff --git a/metadata/org.ppsspp.ppsspp.txt b/metadata/org.ppsspp.ppsspp.txt
index 4a8e2afd2c..e23a5cf847 100644
--- a/metadata/org.ppsspp.ppsspp.txt
+++ b/metadata/org.ppsspp.ppsspp.txt
@@ -28,11 +28,11 @@ Build:0.6.1,61
     commit=v0.6.1
     subdir=android
     submodules=yes
-    target=android-10
-    update=.,../native/android
     forceversion=yes
     forcevercode=yes
     prebuild=rm -rf ../pspautotests/demos*/
+    update=.,../native/android
+    target=android-10
     build=./ab.sh
     buildjni=no
 
@@ -40,9 +40,9 @@ Build:0.70,70
     commit=v0.7
     subdir=android
     submodules=yes
-    target=android-10
-    update=.,../native/android
     prebuild=rm -rf ../pspautotests/demos*/
+    update=.,../native/android
+    target=android-10
     build=./ab.sh
     buildjni=no
 
@@ -50,8 +50,8 @@ Build:0.7.5,75
     commit=v0.7.5
     subdir=android
     submodules=yes
-    update=.,../native/android
     prebuild=rm -rf ../pspautotests/demos*/ custom_rules.xml
+    update=.,../native/android
     build=./ab.sh
     buildjni=no
 
@@ -59,8 +59,8 @@ Build:0.7.6,76
     commit=v0.7.6
     subdir=android
     submodules=yes
-    update=.,../native/android
     prebuild=rm -rf ../pspautotests/demos*/ custom_rules.xml
+    update=.,../native/android
     build=./ab.sh
     buildjni=no
 
@@ -68,8 +68,8 @@ Build:0.8,80
     commit=v0.8
     subdir=android
     submodules=yes
-    update=.,../native/android
     prebuild=rm -rf ../pspautotests/demos*/ custom_rules.xml
+    update=.,../native/android
     build=./ab.sh
     buildjni=no
 
@@ -77,8 +77,8 @@ Build:0.8.1,81
     commit=v0.8.1
     subdir=android
     submodules=yes
-    update=.,../native/android
     prebuild=rm -rf ../pspautotests/demos*/ custom_rules.xml
+    update=.,../native/android
     build=./ab.sh
     buildjni=no
 
@@ -86,8 +86,8 @@ Build:0.9.0,90
     commit=v0.9
     subdir=android
     submodules=yes
-    update=.,../native/android
     prebuild=rm -rf ../pspautotests/demos*/ custom_rules.xml
+    update=.,../native/android
     build=./ab.sh
     buildjni=no
 
@@ -96,10 +96,10 @@ Build:0.9.1,91
     commit=v0.9.1
     subdir=android
     submodules=yes
-    update=.,../native/android
     forceversion=yes
     forcevercode=yes
     prebuild=rm -rf ../pspautotests/demos*/ custom_rules.xml
+    update=.,../native/android
     build=./ab.sh
     buildjni=no
 
@@ -107,10 +107,10 @@ Build:0.9.5-x86,951
     commit=v0.9.5
     subdir=android
     submodules=yes
+    srclibs=NoAnalytics@d38ae535b5
     forceversion=yes
     forcevercode=yes
     rm=dx9sdk,pspautotests,android/custom_rules.xml
-    srclibs=NoAnalytics@d38ae535b5
     prebuild=echo 'APP_ABI=x86' >> jni/Application.mk && \
         rm libs/libGoogleAnalytics* && \
         echo "android.library.reference.2=$$NoAnalytics$$" >> project.properties
@@ -126,10 +126,10 @@ Build:0.9.5-armv7,953
     commit=v0.9.5
     subdir=android
     submodules=yes
+    srclibs=NoAnalytics@d38ae535b5
     forceversion=yes
     forcevercode=yes
     rm=dx9sdk,pspautotests,android/custom_rules.xml
-    srclibs=NoAnalytics@d38ae535b5
     prebuild=echo 'APP_ABI=armeabi-v7a' >> jni/Application.mk && \
         rm libs/libGoogleAnalytics* && \
         echo "android.library.reference.2=$$NoAnalytics$$" >> project.properties
@@ -145,10 +145,10 @@ Build:0.9.6-x86,961
     commit=v0.9.6
     subdir=android
     submodules=yes
+    srclibs=2:NoAnalytics@d38ae535b5
     forceversion=yes
     forcevercode=yes
     rm=dx9sdk,pspautotests,android/custom_rules.xml
-    srclibs=2:NoAnalytics@d38ae535b5
     prebuild=echo 'APP_ABI=x86' >> jni/Application.mk && \
         rm libs/libGoogleAnalytics*
     scanignore=android/android-ndk-profiler
@@ -164,10 +164,10 @@ Build:0.9.6-armv7,963
     commit=v0.9.6
     subdir=android
     submodules=yes
+    srclibs=2:NoAnalytics@d38ae535b5
     forceversion=yes
     forcevercode=yes
     rm=dx9sdk,pspautotests,android/custom_rules.xml
-    srclibs=2:NoAnalytics@d38ae535b5
     prebuild=echo 'APP_ABI=armeabi-v7a' >> jni/Application.mk && \
         rm libs/libGoogleAnalytics*
     scanignore=android/android-ndk-profiler
@@ -183,9 +183,9 @@ Build:0.9.7.1,9711
     commit=v0.9.7.1
     subdir=android
     submodules=yes
+    srclibs=2:NoAnalytics@d38ae535b5
     forcevercode=yes
     rm=dx9sdk,pspautotests,android/custom_rules.xml
-    srclibs=2:NoAnalytics@d38ae535b5
     prebuild=echo 'APP_ABI=armeabi-v7a' >> jni/Application.mk && \
         rm libs/libGoogleAnalytics*
     scanignore=android/android-ndk-profiler
@@ -201,9 +201,9 @@ Build:0.9.7.1,9713
     commit=v0.9.7.1
     subdir=android
     submodules=yes
+    srclibs=2:NoAnalytics@d38ae535b5
     forcevercode=yes
     rm=dx9sdk,pspautotests,android/custom_rules.xml
-    srclibs=2:NoAnalytics@d38ae535b5
     prebuild=echo 'APP_ABI=x86' >> jni/Application.mk && \
         rm libs/libGoogleAnalytics*
     scanignore=android/android-ndk-profiler
@@ -219,9 +219,9 @@ Build:0.9.8,9801
     commit=v0.9.8
     subdir=android
     submodules=yes
+    srclibs=2:NoAnalytics@d38ae535b5
     forcevercode=yes
     rm=dx9sdk,pspautotests,android/custom_rules.xml
-    srclibs=2:NoAnalytics@d38ae535b5
     prebuild=echo 'APP_ABI=x86' >> jni/Application.mk && \
         rm libs/libGoogleAnalytics*
     scanignore=android/android-ndk-profiler
@@ -237,9 +237,9 @@ Build:0.9.8,9803
     commit=v0.9.8
     subdir=android
     submodules=yes
+    srclibs=2:NoAnalytics@d38ae535b5
     forcevercode=yes
     rm=dx9sdk,pspautotests,android/custom_rules.xml
-    srclibs=2:NoAnalytics@d38ae535b5
     prebuild=echo 'APP_ABI=armeabi-v7a' >> jni/Application.mk && \
         rm libs/libGoogleAnalytics*
     scanignore=android/android-ndk-profiler
@@ -259,6 +259,6 @@ Archive Policy:4 versions
 Auto Update Mode:None
 Update Check Mode:Tags
 Vercode Operation:%c*10 + 3
-Current Version:0.9.8
-Current Version Code:9803
+Current Version:0.9.9
+Current Version Code:9903