diff --git a/metadata/de.schildbach.wallet.txt b/metadata/de.schildbach.wallet.txt
index db989f1c30..f1132efabc 100644
--- a/metadata/de.schildbach.wallet.txt
+++ b/metadata/de.schildbach.wallet.txt
@@ -4,40 +4,48 @@ 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
 
-Summary:Wallet for the bitcoin currency
+Summary:Wallet for the Bitcoin currency
 Description:
-A bitcoin wallet, allowing you to store, send and receive bitcoins on your
-device (QR codes and NFC). The initial blockchain setup currently 
-downloads a several
-gigabytes of data, so make sure you use Wifi! The actual blockchain takes 
+N.B The recommended version here is quite old. We will be updating it
+soon and it would be wise to wait for that.
+
+* No cloud server or web service needed. This wallet works peer to peer
+* Display of wallet balance in Bitcoin and various other currencies
+* Sending and receiving of Bitcoin via NFC, QR-codes or Bitcoin URLs
+* Address book for regularly used Bitcoin addresses
+* Enter transactions while offline, will be executed when online
+* Manages blockchain on your device (for security, but see below)
+* System notifications for Bitcoin connectivity and received coins
+* App widget for Bitcoin balance (requirement: app moved from sdcard to phone)
+
+The initial blockchain setup downloads several
+gigabytes of data, so make sure you use WiFi! The actual blockchain takes 
 20MiB of storage,
 and the app is installed to the sdcard by default. When run for the first 
 time, it can 
 happen that the app shows only a white display for some seconds.
 
+Since v2.41 it is able to export private keys to local storage, encrypted
+with a password. It also uses bloom filtering to reduce the amount of data 
+that needs to be downloaded to set up the blockchain. 
+
+See the 
+[http://bitcoin-wallet.googlecode.com/git/wallet/README Readme] for details.
 Use this at your own risk, and be aware that if you lose access to the data
-of this application, you will lose any bitcoins contained in it. To back up
+of this application, you will lose any Bitcoins contained in it. To back up
 the wallet, either; 
 
-# use ADB from the Android SDK if you have Android 4.1+ on the phone (root not required), or 
-# manually back up the files in /data/data/de.schildbach.wallet/files/: <code>#tar cf /sdcard/wallet.tar /data/data/de.schildbach.wallet/files</code> and you may have to change the ownership of the files that you restore. (root required. You can also back up the blockchain.)
+# (From inside the app), export the keys to the sdcard (v2.41+ only)
+# Use ADB from the Android SDK if you have Android 4.1+ on the phone (root not required, but check that it works properly), 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. You can also back up the blockchain in this way.)
 
 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.
 
-The f-droid.org build hasn't been updated in a while as the build process is 
-intricate for us. v2.41 is able to export private keys to local storage, encrypted
-with a password. It also uses bloom filtering to reduce the amount of data 
-that needs to be downloaded to set up the blockchain. 
-Developer-signed builds are available via the website.
+[http://code.google.com/p/bitcoin-wallet/source/browse/wallet/CHANGES Changelog]
 .
 
-#The application doesn't require root, but if you don't have root you'll have
-#no way of backing up your wallet data, so using it without root doesn't make
-#any sense.
-Requires Root:Yes
-
 Repo Type:git
 Repo:https://code.google.com/p/bitcoin-wallet/
 
@@ -59,17 +67,17 @@ prebuild=\
 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:2.41,107,!needs maven2 and maven3 c34a67ac9e4e,subdir=wallet,maven=2,\
-bindir=wallet/target,\
-srclibs=BitcoinJWallet@3b7a494a370a,extlibs=android/android-support-v4.jar,\
-init=sed -i 's/_test//' AndroidManifest.xml && find src -name *.java -exec sed -i 's/_test\.R/.R/' {} \;,\
-prebuild=\
-cd ../integration-android && mvn3 install && cd ../wallet && \
-mvn3 install:install-file -DgroupId=android -DartifactId=android -Dversion=4.0.1.2 -Dpackaging=jar -Dfile=$$SDK$$/platforms/android-14/android.jar && \
-mvn3 install:install-file -DgroupId=android.support -DartifactId=compatibility-v4 -Dversion=r11 -Dpackaging=jar -Dfile=libs/android-support-v4.jar
+# Build from prodnet branch which cherry picks some old commits and commits after tags
+# Next version will be coming from bitcoinj-0.8-prodnet branch -> master or prodnet
+Build Version:2.48,115,!Wait for 3.0 41dc87f5ec,maven=yes,bindir=wallet/target,\
+srclibs=BitcoinJWallet@release-0.7,prebuild=rm -rf market/ && \
+sed -i '57 i \\t<scope>provided</scope>' wallet/pom.xml && \
+$$MVN3$$ install -f $$BitcoinJWallet$$/pom.xml && \
+$$MVN3$$ install:install-file -DgroupId=com.google -DartifactId=bitcoinj -Dversion=0.7.3 \
+-Dpackaging=jar -Dfile=$$BitcoinJWallet$$/core/target/bitcoinj-0.7.3.jar
 
 Auto Update Mode:None
-#RM don't work
+# RM/Tags don't work
 Update Check Mode:Market
 Current Version:2.48
 Current Version Code:115
diff --git a/metadata/de.schildbach.wallet_test.txt b/metadata/de.schildbach.wallet_test.txt
index 5dee469489..7776fb6abf 100644
--- a/metadata/de.schildbach.wallet_test.txt
+++ b/metadata/de.schildbach.wallet_test.txt
@@ -4,7 +4,7 @@ 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
 
-Summary:Testing version of the bitcoin wallet
+Summary:Testing version of Bitcoin Wallet app
 Description:
 A bitcoin wallet, allowing you to store, send and receive bitcoins on your
 device, both via QR codes and NFC. The initial blockchain setup, the thing 
@@ -15,6 +15,8 @@ it can happen that the app shows only a white display for some seconds. This is
 
 This is a test version that uses the test Bitcoin network, not the real
 one.
+
+[http://code.google.com/p/bitcoin-wallet/source/browse/wallet/CHANGES Changelog]
 .
 
 Repo Type:git
@@ -44,17 +46,16 @@ 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:2.22_test,93,!maven problems at 2f3368257df7,subdir=wallet,maven=yes,\
-bindir=wallet/target,\
-srclibs=BitcoinJWallet@dc213e9dda8fff,\
-prebuild=\
-cd $$BitcoinJWallet$$ && $$MVN3$$ install && cd - && \
-cd ../integration-android && $$MVN3$$ install && cd - && \
-$$MVN3$$ install:install-file -DgroupId=android -DartifactId=android -Dversion=2.3.3_r2 -Dpackaging=jar -Dfile=$$SDK$$/platforms/android-10/android.jar && \
-P=$(grep -n support-v4 pom.xml | cut -d\: -f 1) && sed -i "$(expr $P - 2)\,$(expr $P + 2)d" pom.xml
+Build Version:2.48-test,115,v2.48,subdir=wallet,maven=yes,bindir=wallet/target,\
+srclibs=BitcoinJWallet@release-0.7,init=\
+sed -i '57 i \\t<scope>provided</scope>' wallet/pom.xml,build=\
+$$MVN3$$ install -f $$BitcoinJWallet$$/pom.xml && \
+$$MVN3$$ install:install-file -DgroupId=com.google -DartifactId=bitcoinj -Dversion=0.7.3 \
+-Dpackaging=jar -Dfile=$$BitcoinJWallet$$/core/target/bitcoinj-0.7.3.jar
 
 Auto Update Mode:None
-Update Check Mode:RepoManifest
+# Just use main wallet app
+Update Check Mode:Static
 Current Version:2.48-test
 Current Version Code:115
 
diff --git a/metadata/net.avs234.txt b/metadata/net.avs234.txt
index 88a25d26f6..98b042a7c1 100644
--- a/metadata/net.avs234.txt
+++ b/metadata/net.avs234.txt
@@ -14,8 +14,8 @@ are also supported and files are chosen via directories.
 Repo Type:git-svn
 Repo:https://andless.googlecode.com/svn/trunk
 
-#Builds with ndk-r8b but not ndk-r8c; system libraries in jni/Android/lib
-Build Version:1.3.5,16,96,target=android-17,buildjni=yes
+# Needs Manifest hack for buildjni to work with ndk-r8c; system libraries in jni/Android/lib
+Build Version:1.3.5,16,96,target=android-17,scanignore=build/net.avs234,buildjni=yes
 
 Auto Update Mode:None
 Update Check Mode:Market