diff --git a/metadata/com.jefftharris.passwdsafe.yml b/metadata/com.jefftharris.passwdsafe.yml
index d15261002f..c2ab97b9de 100644
--- a/metadata/com.jefftharris.passwdsafe.yml
+++ b/metadata/com.jefftharris.passwdsafe.yml
@@ -1,18 +1,20 @@
 AntiFeatures:
-  - UpstreamNonFree
+  - NonFreeAssets
 Categories:
   - Security
 License: Artistic-2.0
 WebSite: https://sourceforge.net/p/passwdsafe/wiki/Home/
 SourceCode: https://sourceforge.net/p/passwdsafe/code/ci/default/tree
-IssueTracker: https://sourceforge.net/projects/passwdsafe/support
-Donate: https://passwdsafe.sourceforge.net
+IssueTracker: https://sourceforge.net/p/passwdsafe/_list/tickets
+Changelog: https://sourceforge.net/p/passwdsafe/news/
+Donate: https://www.paypal.com/cgi-bin/webscr?item_name=Donation+to+PasswdSafe&cmd=_donations&business=jefftharris%40gmail.com
 
 AutoName: PasswdSafe
 Summary: Port of PasswordSafe password manager
 Description: |-
-    PasswdSafe is a port of the Password Safe (<a href="https://pwsafe.org/">https://pwsafe.org/</a>) application to
-    Android. YubiKey NEO tokens are supported for two-factor authentication.
+    PasswdSafe is a port of the Password Safe (<a href="https://pwsafe.org/">https://pwsafe.org/</a>) application to Android. YubiKey NEO tokens are supported for two-factor authentication. File passwords can be saved on devices with a fingerprint scanner and Android 6.0 or higher.
+
+    ***Please maintain a known-good backup in case bugs exist***
 
 RepoType: hg
 Repo: http://hg.code.sf.net/p/passwdsafe/code
@@ -163,20 +165,27 @@ Builds:
       - yes
     ndk: r12b
 
-  - versionName: 5.4.0
-    versionCode: 50400
-    disable: jar files, native libs, play-services
-    commit: rel-5.4.0
+  - versionName: 6.21.3
+    versionCode: 6210300
+    commit: 6.21.3
     subdir: passwdsafe
+    sudo:
+      - apt-get update || apt-get update
+      - apt-get install -y openjdk-11-jdk-headless
+      - update-alternatives --auto java
     gradle:
       - yes
     rm:
       - passwdsafe/libs/*.jar
-    prebuild: sed -i -e '/fileTree/acompile "org.bouncycastle:bcprov-jdk14:1.51"'
+    prebuild:
+      - sed -i -e '/fileTree/aimplementation "org.bouncycastle:bcprov-jdk15:1.43"'
         build.gradle
+      - sed -i -e '/play-services-auth/d' ../sync/build.gradle
+    scandelete:
+      - lib-owncloud/libs
+    ndk: r21d
 
-ArchivePolicy: 0 versions
-AutoUpdateMode: None
-UpdateCheckMode: Static
-CurrentVersion: 5.4.0
-CurrentVersionCode: 50400
+AutoUpdateMode: Version
+UpdateCheckMode: Tags
+CurrentVersion: 6.21.3
+CurrentVersionCode: 6210300