diff --git a/security/keepassxc/Makefile b/security/keepassxc/Makefile
index 9ff9e56ae1bec..77ecb6ff7b4db 100644
--- a/security/keepassxc/Makefile
+++ b/security/keepassxc/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	keepassxc
-DISTVERSION=	2.6.4
+DISTVERSION=	2.6.6
 CATEGORIES=	security
 MASTER_SITES=	https://github.com/keepassxreboot/keepassxc/releases/download/${DISTVERSION}/${PORTNAME}-${DISTVERSION}-src.tar.xz?dummy=/
 
@@ -20,8 +20,8 @@ LIB_DEPENDS=	libargon2.so:security/libargon2 \
 		libqrencode.so:graphics/libqrencode \
 		libsodium.so:security/libsodium
 
-USES=		cmake compiler:c++11-lang desktop-file-utils qt:5 readline \
-		shared-mime-info tar:xz xorg
+USES=		cmake compiler:c++11-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
 USE_XORG=	x11
@@ -30,7 +30,7 @@ CMAKE_OFF=	WITH_XC_UPDATECHECK
 
 CONFLICTS_INSTALL=	keepassx-0.* keepassx2-* keepassx-*
 
-OPTIONS_DEFINE=		AUTOTYPE BROWSER KEESHARE NETWORKING YUBIKEY SSHAGENT TEST
+OPTIONS_DEFINE=		AUTOTYPE BROWSER KEESHARE NETWORKING SSHAGENT YUBIKEY TEST
 OPTIONS_DEFAULT=	AUTOTYPE BROWSER KEESHARE NETWORKING SSHAGENT YUBIKEY
 OPTIONS_SUB=		yes
 
diff --git a/security/keepassxc/distinfo b/security/keepassxc/distinfo
index effe129ed4e22..d1cfef98386ef 100644
--- a/security/keepassxc/distinfo
+++ b/security/keepassxc/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1612416166
-SHA256 (keepassxc-2.6.4.tar.xz) = e536e2a71c90fcf264eb831fb1a8b518ee1b03829828f862eeea748d3310f82b
-SIZE (keepassxc-2.6.4.tar.xz) = 7575164
+TIMESTAMP = 1624333502
+SHA256 (keepassxc-2.6.6.tar.xz) = 3603b11ac39b289c47fac77fa150e05fd64b393d8cfdf5732dc3ef106650a4e2
+SIZE (keepassxc-2.6.6.tar.xz) = 7640532
diff --git a/security/keepassxc/files/patch-src_keeshare_CMakeLists.txt b/security/keepassxc/files/patch-src_keeshare_CMakeLists.txt
new file mode 100644
index 0000000000000..003158ed74e00
--- /dev/null
+++ b/security/keepassxc/files/patch-src_keeshare_CMakeLists.txt
@@ -0,0 +1,10 @@
+--- src/keeshare/CMakeLists.txt.orig	2021-06-22 18:07:30 UTC
++++ src/keeshare/CMakeLists.txt
+@@ -25,6 +25,7 @@ if(WITH_XC_KEESHARE)
+     find_package(QuaZip)
+     if(QUAZIP_FOUND)
+         set(WITH_XC_KEESHARE_SECURE ON PARENT_SCOPE)
++        target_link_directories(keeshare BEFORE PUBLIC ${QUAZIP_LIBRARY_DIRS})
+         target_include_directories(keeshare SYSTEM PRIVATE ${QUAZIP_INCLUDE_DIRS})
+         target_link_libraries(keeshare PRIVATE ${QUAZIP_LIBRARIES})
+     else()
diff --git a/security/keepassxc/pkg-plist b/security/keepassxc/pkg-plist
index c666c209502b6..9baa6481fdfdd 100644
--- a/security/keepassxc/pkg-plist
+++ b/security/keepassxc/pkg-plist
@@ -24,6 +24,7 @@ share/icons/hicolor/scalable/mimetypes/application-x-keepassxc.svg
 %%DATADIR%%/translations/keepassx_cs.qm
 %%DATADIR%%/translations/keepassx_da.qm
 %%DATADIR%%/translations/keepassx_de.qm
+%%DATADIR%%/translations/keepassx_el.qm
 %%DATADIR%%/translations/keepassx_en.qm
 %%DATADIR%%/translations/keepassx_en_GB.qm
 %%DATADIR%%/translations/keepassx_en_US.qm
@@ -31,6 +32,7 @@ share/icons/hicolor/scalable/mimetypes/application-x-keepassxc.svg
 %%DATADIR%%/translations/keepassx_et.qm
 %%DATADIR%%/translations/keepassx_fi.qm
 %%DATADIR%%/translations/keepassx_fr.qm
+%%DATADIR%%/translations/keepassx_fr_CA.qm
 %%DATADIR%%/translations/keepassx_hr_HR.qm
 %%DATADIR%%/translations/keepassx_hu.qm
 %%DATADIR%%/translations/keepassx_id.qm
@@ -47,6 +49,7 @@ share/icons/hicolor/scalable/mimetypes/application-x-keepassxc.svg
 %%DATADIR%%/translations/keepassx_ru.qm
 %%DATADIR%%/translations/keepassx_sk.qm
 %%DATADIR%%/translations/keepassx_sl_SI.qm
+%%DATADIR%%/translations/keepassx_sr.qm
 %%DATADIR%%/translations/keepassx_sv.qm
 %%DATADIR%%/translations/keepassx_th.qm
 %%DATADIR%%/translations/keepassx_tr.qm