diff --git a/tools/build-beta b/tools/build-beta
index de0f3f626..bf8381713 100755
--- a/tools/build-beta
+++ b/tools/build-beta
@@ -1,7 +1,9 @@
 perl -pi -e's|\@string/app_name|\@string/beta_app_name|g' AndroidManifest.xml
 perl -pi -e's/"com.fsck.k9"/"com.fsck.k9beta"/g' build.xml AndroidManifest.xml
 perl -pi -e's|com/fsck/k9/R.java|com/fsck/k9beta/R.java|g' build.xml
+perl -pi -e's|K9|K9-BETA|g' build.xml
 ant $@
+perl -pi -e's|K9-BETA|K9|g' build.xml
 perl -pi -e's/com\.fsck\.k9beta/com.fsck.k9/g' build.xml AndroidManifest.xml
 perl -pi -e's|com/fsck/k9beta/R.java|com/fsck/k9/R.java|g' build.xml
 perl -pi -e's|\@string/beta_app_name|\@string/app_name|g' AndroidManifest.xml