diff --git a/srcpkgs/keepassxc/patches/001-musl.patch b/srcpkgs/keepassxc/patches/001-musl.patch
new file mode 100644
index 0000000000..907869b2f8
--- /dev/null
+++ b/srcpkgs/keepassxc/patches/001-musl.patch
@@ -0,0 +1,25 @@
+# include prototypes for musl
+# should not be neccesary for keepassxc 2.3.2
+# see: https://github.com/keepassxreboot/keepassxc/pull/1726
+
+--- src/sshagent/blf.h
++++ src/sshagent/blf.h
+@@ -30,6 +30,8 @@
+  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+  */
++#define _GNU_SOURCE
++#include <sys/types.h>
+ 
+ #ifndef _BLF_H_
+ #define _BLF_H_
+--- src/sshagent/blowfish.c
++++ src/sshagent/blowfish.c
+@@ -49,7 +49,6 @@
+ #include <string.h>
+ #endif
+ 
+-#include <sys/types.h>
+ #ifdef HAVE_BLF_H
+ #include "blf.h"
+ #endif
diff --git a/srcpkgs/keepassxc/template b/srcpkgs/keepassxc/template
index dedf4fe275..e243f85eef 100644
--- a/srcpkgs/keepassxc/template
+++ b/srcpkgs/keepassxc/template
@@ -1,21 +1,38 @@
 # Template file for 'keepassxc'
 pkgname=keepassxc
-version=2.2.4
+version=2.3.1
 revision=1
 build_style=cmake
-configure_args="-DWITH_XC_HTTP=ON -DWITH_XC_YUBIKEY=ON -DWITH_XC_AUTOTYPE=ON -DWITH_TESTS=OFF"
-makedepends="libXtst-devel libgcrypt-devel libykpers-devel libyubikey-devel qt5-tools-devel qt5-x11extras-devel"
+configure_args="-DWITH_TESTS=OFF
+ -DWITH_XC_AUTOTYPE=$(vopt_if autotype ON OFF)
+ -DWITH_XC_NETWORKING=$(vopt_if network ON OFF)
+ -DWITH_XC_YUBIKEY=$(vopt_if yubikey ON OFF)
+ -DWITH_XC_BROWSER=$(vopt_if browser ON OFF)
+ -DWITH_XC_SSHAGENT=$(vopt_if sshagent ON OFF)"
+makedepends="qt5-tools-devel libgcrypt-devel libargon2-devel
+	$(vopt_if autotype qt5-x11extras-devel)
+	$(vopt_if browser libsodium-devel)
+	$(vopt_if network libcurl-devel)
+	$(vopt_if yubikey 'libykpers-devel libyubikey-devel')"
 short_desc="KeePassXC is a cross-platform port of “Keepass Password Safe”"
 maintainer="ibrokemypie <ibrokemypie@bastardi.net>"
 license="GPL-3, GPL-2, BSD-3-clause, LGPL-2, LGPL-2.1, LGPL-3+, Boost-1.0, CC-0"
 homepage="https://keepassxc.org/"
-distfiles="https://github.com/keepassxreboot/keepassxc/archive/${version}.tar.gz"
-checksum=e884439ed3ad461e426a25f0492f5fa78ab8ba06fb718977b3867d8f098ccd0a
+distfiles="https://github.com/keepassxreboot/keepassxc/releases/download/${version}/keepassxc-${version}-src.tar.xz"
+checksum=ce7d8251d4d5b35f602ff521764910964da6d8a67397399855a6e8c5ff5db9bd
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools qt5-qmake qt5-tools"
 fi
 
+build_options="autotype browser network sshagent yubikey"
+desc_option_autotype="Enable auto-type"
+desc_option_browser="Enable browser integration with keepassxc-browser"
+desc_option_network="Enable networking support"
+desc_option_sshagent="Enable SSH agent support"
+desc_option_yubikey="Enable YubiKey HMAC-SHA1 authentication support"
+build_options_default="autotype sshagent yubikey"
+
 post_install() {
 	vlicense COPYING
 	vlicense LICENSE.BOOST-1.0