diff --git a/metadata/de.schildbach.wallet.txt b/metadata/de.schildbach.wallet.txt
index 550ae936b2..0ac07763dd 100644
--- a/metadata/de.schildbach.wallet.txt
+++ b/metadata/de.schildbach.wallet.txt
@@ -855,18 +855,14 @@ Build:5.23,303
         sed -i -e "s,url 'https://maven.google.com',url 'https://jitpack.io',g" build.gradle ../build.gradle
     scanignore=wallet/test/de/schildbach/wallet/util/backup-protobuf-testnet
 
-Maintainer Notes:
-See wallet/{README,CHANGES} or git log for info about what BitcoinJ tag to use.
-Use latest commit in 'prod' branch, which is a rebase on top of the latest tag.
-
-Note also that the 'prod:' commits seem to disappear, as if the developer is
-removing them and force-pushing the branch. We need to take an alternative
-approach to building this in future.
-
-Pick last from https://github.com/bitcoin-wallet/bitcoin-wallet/commits/prod
-.
+Build:5.25,305
+    commit=v5.25-prod
+    subdir=wallet
+    gradle=yes
+    prebuild=echo 'task wrapper(type: Wrapper) { gradleVersion = "2.10" }' >> ../build.gradle
+    scanignore=wallet/test/de/schildbach/wallet/util/backup-protobuf-testnet
 
 Auto Update Mode:None
 Update Check Mode:RepoManifest/prod
-Current Version:5.24
-Current Version Code:304
+Current Version:5.25
+Current Version Code:305
diff --git a/metadata/de.schildbach.wallet_test.txt b/metadata/de.schildbach.wallet_test.txt
index 7f867469ba..d72f5a171a 100644
--- a/metadata/de.schildbach.wallet_test.txt
+++ b/metadata/de.schildbach.wallet_test.txt
@@ -849,6 +849,13 @@ Build:5.24-test,304
     prebuild=echo 'task wrapper(type: Wrapper) { gradleVersion = "2.10" }' >> ../build.gradle
     scanignore=wallet/test/de/schildbach/wallet/util/backup-protobuf-testnet
 
+Build:5.25-test,305
+    commit=v5.25
+    subdir=wallet
+    gradle=yes
+    prebuild=echo 'task wrapper(type: Wrapper) { gradleVersion = "2.10" }' >> ../build.gradle
+    scanignore=wallet/test/de/schildbach/wallet/util/backup-protobuf-testnet
+
 Auto Update Mode:None
 Update Check Mode:Tags
 Current Version:5.25-test