diff --git a/metadata/de.schildbach.wallet.txt b/metadata/de.schildbach.wallet.txt
index a982d2a1ba..2eff9d2927 100644
--- a/metadata/de.schildbach.wallet.txt
+++ b/metadata/de.schildbach.wallet.txt
@@ -4,6 +4,10 @@ Web Site:http://code.google.com/p/bitcoin-wallet/
 Source Code:http://code.google.com/p/bitcoin-wallet/source/checkout
 Issue Tracker:http://code.google.com/p/bitcoin-wallet/issues/list
 
+#There's a separate version of this application that uses a test version of the
+#Bitcoin network. It would be wise to use that first, to verify that everything
+#works for you without using real Bitcoins.
+
 Summary:Wallet for the Bitcoin currency
 Description:
 Since v2.41 it is able to export private keys to local storage, encrypted
@@ -32,10 +36,6 @@ the wallet, either;
 # Use ADB backup from the Android SDK if you have Android 4+ on the phone (root not required, but check that it works properly: since v2 is installed to sdcard by default, the shared storage needs backing up too), or
 # Manually back up the files in /data/data/de.schildbach.wallet/files/: #tar cf /sdcard/wallet.tar /data/data/de.schildbach.wallet/files and you may have to change the ownership of the files that you restore (root required)
 
-There's a separate version of this application that uses a test version of the
-Bitcoin network. It would be wise to use that first, to verify that everything
-works for you without using real Bitcoins.
-
 [http://code.google.com/p/bitcoin-wallet/source/browse/wallet/CHANGES Changelog]
 .
 
@@ -63,8 +63,10 @@ mvn3 install:install-file -DgroupId=android -DartifactId=android -Dversion=2.3.3
 mvn3 install:install-file -DgroupId=android.support -DartifactId=compatibility-v4 -Dversion=r6 -Dpackaging=jar -Dfile=$$SDK$$/android-compatibility/v4/android-support-v4.jar
 # Build from prodnet branch which cherry picks some old commits and commits after tags
 # The git reset (or specific commit instead of a tag) is from the bitcoinj wiki and is used for security
-Build Version:3.01,121,!742241f59df1,maven=yes,patch=pom.patch,\
+Build Version:3.01,121,master,maven=yes,init=\
+git fetch origin && git checkout origin/prodnet,patch=pom.patch,\
 bindir=wallet/target,srclibs=BitcoinJWallet@1649520e3183,prebuild=\
+sed -i '54 i \\tandroid:debuggable=\"false\"' wallet/AndroidManifest.xml && \
 cp -r $$BitcoinJWallet$$/ . && rm -rf market/
 
 Auto Update Mode:None
diff --git a/metadata/de.schildbach.wallet_test.txt b/metadata/de.schildbach.wallet_test.txt
index 15a7e8064f..ac91919535 100644
--- a/metadata/de.schildbach.wallet_test.txt
+++ b/metadata/de.schildbach.wallet_test.txt
@@ -1,10 +1,10 @@
+Disabled:We don't allow debuggable apps any more
 Category:Office
 License:GPLv3
 Web Site:http://code.google.com/p/bitcoin-wallet/
 Source Code:http://code.google.com/p/bitcoin-wallet/source/checkout
 Issue Tracker:http://code.google.com/p/bitcoin-wallet/issues/list
 
-Name:Bitcoin Wallet Test
 Summary:Testing version of Bitcoin Wallet app
 Description:
 A bitcoin wallet, allowing you to store, send and receive bitcoins on your
@@ -45,7 +45,7 @@ cd $$BitcoinJWallet$$ && $$MVN3$$ install && cd - && \
 cd ../integration-android && $$MVN3$$ install && cd ../wallet && \
 mvn3 install:install-file -DgroupId=android -DartifactId=android -Dversion=2.3.3_r2 -Dpackaging=jar -Dfile=$$SDK$$/platforms/android-10/android.jar && \
 mvn3 install:install-file -DgroupId=android.support -DartifactId=compatibility-v4 -Dversion=r6 -Dpackaging=jar -Dfile=$$SDK$$/android-compatibility/v4/android-support-v4.jar
-Build Version:3.01-test,121,!v3.01,maven=yes,patch=pom.patch,\
+Build Version:3.01-test,121,v3.01,maven=yes,patch=pom.patch,\
 bindir=wallet/target,srclibs=BitcoinJWallet@1649520e3183,prebuild=\
 cp -r $$BitcoinJWallet$$/ . && rm -rf market/