diff --git a/security/keepassxc/Makefile b/security/keepassxc/Makefile
index a519e7fe605..2f0706c7488 100644
--- a/security/keepassxc/Makefile
+++ b/security/keepassxc/Makefile
@@ -2,7 +2,7 @@ COMMENT =	management tool for password and sensitive data
 
 V =		2.7.4
 DISTNAME =	keepassxc-${V}
-REVISION =	1
+REVISION =	2
 
 CATEGORIES =	security
 
@@ -21,6 +21,12 @@ MASTER_SITES =	\
 	https://github.com/keepassxreboot/keepassxc/releases/download/${V}/
 EXTRACT_SUFX =	-src.tar.xz
 
+MASTER_SITES0 =	https://github.com/keepassxreboot/keepassxc/
+# pending "Set password hint on BSD, fill selection on macOS again"
+# https://github.com/keepassxreboot/keepassxc/pull/8949
+PATCHFILES =	keepassxc-set-password-hint-{commit/}27e92da.patch:0
+PATCH_DIST_STRIP =	-p1
+
 MODULES =	x11/qt5 \
 		devel/cmake
 
diff --git a/security/keepassxc/distinfo b/security/keepassxc/distinfo
index 7c93f889963..c449a6e3141 100644
--- a/security/keepassxc/distinfo
+++ b/security/keepassxc/distinfo
@@ -1,2 +1,4 @@
 SHA256 (keepassxc-2.7.4-src.tar.xz) = VgBSlh2gOJMn51kXH2YCMN+k4PTh+rYTlgD7hcbl3s4=
+SHA256 (keepassxc-set-password-hint-27e92da.patch) = kz8OTY8h786C/EXlYXwe72zU23owI4gm9JlFqhWcGXQ=
 SIZE (keepassxc-2.7.4-src.tar.xz) = 8957372
+SIZE (keepassxc-set-password-hint-27e92da.patch) = 1102