diff --git a/metadata/com.google.android.diskusage.txt b/metadata/com.google.android.diskusage.txt
index fb41d22a..5a2f3015 100644
--- a/metadata/com.google.android.diskusage.txt
+++ b/metadata/com.google.android.diskusage.txt
@@ -14,7 +14,7 @@ Repo:http://diskusage.googlecode.com/svn/trunk/
 
 Build Version:2.0.4,2004,61,prebuild=mkdir libs && cp extra/system.jar libs/
 #Note - version name/code is wrong in the repo - we replace it
-Build Version:2.0.5,2005,62,prebuild=mkdir libs && cp extra/system.jar libs/,insertversion=2.0.4,insertvercode=2004
+Build Version:2.0.5,2005,62,prebuild=mkdir libs && cp extra/system.jar libs/,forceversion=yes,forcevercode=yes
 Build Version:2.1.3,2103,65,prebuild=mkdir libs && cp extra/system.jar libs/
 Build Version:3.0alpha2,3001,!repo version incorrect,prebuild=mkdir libs && cp extra/system.jar libs/
 Build Version:3.0alpha3,3005,!no source in repo,prebuild=mkdir libs && cp extra/system.jar libs/
diff --git a/metadata/org.helllabs.android.xmp.txt b/metadata/org.helllabs.android.xmp.txt
index fed13459..02401be8 100644
--- a/metadata/org.helllabs.android.xmp.txt
+++ b/metadata/org.helllabs.android.xmp.txt
@@ -17,10 +17,10 @@ Repo Type:git
 Repo:git://xmp.git.sourceforge.net/gitroot/xmp/xmp
 
 # This is one of those projects that put the changelog in the version
-# number, so fix that with insertversion.
+# number, so fix that with forceversion.
 Build Version:2.1.0,15,639549fda2111cb800fabe468b4a64bf4ae27003,\
 buildjni=yes,subdir=src/android/project,target=android-8,\
-insertversion=2.1.0[^"]*
+forceversion=yes
 
 Update Check Mode:Market
 Current Version:2.4.0