diff --git a/security/keepassxc/Makefile b/security/keepassxc/Makefile
index 8726c3b7b3a3..e1d4ff16a0a7 100644
--- a/security/keepassxc/Makefile
+++ b/security/keepassxc/Makefile
@@ -1,63 +1,65 @@
 PORTNAME=	keepassxc
-DISTVERSION=	2.7.0
+DISTVERSION=	2.7.1
 CATEGORIES=	security
-MASTER_SITES=	https://github.com/keepassxreboot/keepassxc/releases/download/${DISTVERSION}/${PORTNAME}-${DISTVERSION}-src.tar.xz?dummy=/
+MASTER_SITES=	https://github.com/keepassxreboot/keepassxc/releases/download/${DISTVERSION}/
+DISTNAME=	${PORTNAME}-${DISTVERSION}-src
 
 MAINTAINER=	lwhsu@FreeBSD.org
 COMMENT=	KeePass Cross-platform Community Edition
 
 LICENSE=	APACHE20 BSD3CLAUSE CC0-1.0 GPLv2 GPLv3 LGPL21 LGPL3 MIT \
 		NOKIA-LGPL-EXCEPTION
 LICENSE_COMB=	multi
 LICENSE_NAME_NOKIA-LGPL-EXCEPTION=	Nokia Qt LGPL Exception version 1.1
 LICENSE_FILE_NOKIA-LGPL-EXCEPTION=	${WRKSRC}/LICENSE.NOKIA-LGPL-EXCEPTION
 LICENSE_PERMS_NOKIA-LGPL-EXCEPTION=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
 
 BUILD_DEPENDS=	asciidoctor:textproc/rubygem-asciidoctor
 LIB_DEPENDS=	libargon2.so:security/libargon2 \
 		libqrencode.so:graphics/libqrencode \
 		libbotan-2.so:security/botan2
 
 USES=		cmake compiler:c++17-lang desktop-file-utils pkgconfig qt:5 \
 		readline shared-mime-info tar:xz xorg
 USE_QT=		concurrent core dbus gui network svg widgets buildtools_build \
 		linguisttools_build qmake_build testlib_build x11extras
 USE_XORG=	x11
 
+WRKSRC=		${WRKDIR}/${DISTNAME:S/-src//}
 CMAKE_OFF=	WITH_XC_UPDATECHECK
 
 CONFLICTS_INSTALL=	keepassx-0.* keepassx2 keepassx
 
 OPTIONS_DEFINE=		AUTOTYPE BROWSER FDOSECRETS KEESHARE NETWORKING SSHAGENT YUBIKEY TEST
 OPTIONS_DEFAULT=	AUTOTYPE BROWSER FDOSECRETS KEESHARE NETWORKING SSHAGENT YUBIKEY
 OPTIONS_SUB=		yes
 
 AUTOTYPE_CMAKE_BOOL=	WITH_XC_AUTOTYPE
 AUTOTYPE_DESC=		Auto-type passwords in input fields
 AUTOTYPE_USE=		XORG=xi,xtst
 
 BROWSER_CMAKE_BOOL=	WITH_XC_BROWSER
 BROWSER_DESC=		Browser integration with KeePassXC-Browser
 
 FDOSECRETS_CMAKE_BOOL=	WITH_XC_FDOSECRETS
 FDOSECRETS_DESC=	freedesktop.org secrets service support
 
 KEESHARE_CMAKE_BOOL=	WITH_XC_KEESHARE
 KEESHARE_DESC=		Sharing integration with KeeShare
-KEESHARE_LIB_DEPENDS=	libminizip.so:archivers/minizip
+KEESHARE_USES=		minizip
 
 # Legacy/Deprecated.
 NETWORKING_CMAKE_BOOL=	WITH_XC_NETWORKING
 NETWORKING_DESC=	Networking support (e.g. for downloading website icons)
 
 SSHAGENT_CMAKE_BOOL=	WITH_XC_SSHAGENT
 SSHAGENT_DESC=		SSH agent support
 
 YUBIKEY_CMAKE_BOOL=	WITH_XC_YUBIKEY
 YUBIKEY_DESC=		YubiKey support
 YUBIKEY_LIB_DEPENDS=	libpcsclite.so:devel/pcsc-lite
 
 TEST_CMAKE_BOOL=	WITH_TESTS WITH_GUI_TESTS
 TEST_TEST_TARGET=	test
 
 .include <bsd.port.mk>
diff --git a/security/keepassxc/distinfo b/security/keepassxc/distinfo
index 64bb201fd9ab..b1b1cb1951e4 100644
--- a/security/keepassxc/distinfo
+++ b/security/keepassxc/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1648564382
-SHA256 (keepassxc-2.7.0.tar.xz) = 83be76890904cd6703343fa097d68bcfdd99bb525cf518fa62a7df9293026aa7
-SIZE (keepassxc-2.7.0.tar.xz) = 8846780
+TIMESTAMP = 1650895642
+SHA256 (keepassxc-2.7.1-src.tar.xz) = 6001ba626c35c316dbda6de35736f012a2264f95139fcb4a094b8eb49b15d3e7
+SIZE (keepassxc-2.7.1-src.tar.xz) = 8804436
diff --git a/security/keepassxc/files/patch-src_keeshare_ShareExport.cpp b/security/keepassxc/files/patch-src_keeshare_ShareExport.cpp
deleted file mode 100644
index 0ad8a72f54aa..000000000000
--- a/security/keepassxc/files/patch-src_keeshare_ShareExport.cpp
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/keeshare/ShareExport.cpp.orig	2022-03-21 22:47:20 UTC
-+++ src/keeshare/ShareExport.cpp
-@@ -27,7 +27,7 @@
- 
- #include <QBuffer>
- #include <botan/pubkey.h>
--#include <zip.h>
-+#include <minizip/zip.h>
- 
- namespace
- {
diff --git a/security/keepassxc/files/patch-src_keeshare_ShareImport.cpp b/security/keepassxc/files/patch-src_keeshare_ShareImport.cpp
deleted file mode 100644
index bb3eb2211610..000000000000
--- a/security/keepassxc/files/patch-src_keeshare_ShareImport.cpp
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/keeshare/ShareImport.cpp.orig	2022-03-21 22:47:20 UTC
-+++ src/keeshare/ShareImport.cpp
-@@ -21,7 +21,7 @@
- #include "keys/PasswordKey.h"
- 
- #include <QBuffer>
--#include <unzip.h>
-+#include <minizip/unzip.h>
- 
- namespace
- {