diff --git a/srcpkgs/neomutt/template b/srcpkgs/neomutt/template
index 39927bb48fb..791bdcafd7c 100644
--- a/srcpkgs/neomutt/template
+++ b/srcpkgs/neomutt/template
@@ -1,29 +1,29 @@
 # Template file for 'neomutt'
 pkgname=neomutt
-version=20220429
-revision=3
+version=20230517
+revision=1
 create_wrksrc=true
 build_wrksrc="${pkgname}-${version}"
 build_style=configure
 configure_args="--ssl --gpgme --notmuch --gdbm --lua --sasl --zlib --tdb
- --rocksdb --testing"
+ --rocksdb"
 make_check_target=test
 conf_files="/etc/neomuttrc"
 # neomutt needs either w3m/lynx/elinks to build manual.html
-hostmakedepends="docbook-xsl gettext libxslt perl tcl w3m"
-makedepends="aspell-devel gdbm-devel gettext-devel gpgme-devel libidn-devel
- rocksdb-devel tdb-devel ncurses-devel
- libnotmuch-devel openssl-devel libsasl-devel lua54-devel zlib-devel"
+hostmakedepends="docbook-xsl gettext libxslt perl tcl w3m pkg-config"
+makedepends="aspell-devel gdbm-devel gettext-devel gpgme-devel
+ rocksdb-devel tdb-devel ncurses-devel libidn2-devel libnotmuch-devel
+ openssl-devel libsasl-devel lua54-devel zlib-devel"
 depends="mime-types"
 short_desc="Mutt with misc fixes and feature patches"
 maintainer="Toyam Cox <Vaelatern@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://neomutt.org/"
-_test_files_hash=dc9fb32a701eb9dce4fda93c27da1d9b5be23231
+_test_files_hash=34f79ee9d91863a97f6e18700aea51157b8610cf
 distfiles="https://github.com/neomutt/neomutt/archive/${version}.tar.gz
  https://github.com/neomutt/neomutt-test-files/archive/${_test_files_hash}.tar.gz"
-checksum="45496542897ba8de6bc7cce3f5951d9033ed1c49e5d6f1353adaeefe795d9043
- bda7c7f9f7bac528398040a46da505f906913a86f5db65cdbab743d595ee2947"
+checksum="4ac277b40e7ed5d67ba516338e2b26cc6810aa37564f6e9a2d45eb15b3a9213e
+ 4507e70e7c8512c993d9188cf320aea601580345ae9fb0c399ed1402d4e39b1f"
 python_version=3
 
 # fix:
@@ -34,13 +34,22 @@ if [ "${XBPS_CROSS_BASE}" ]; then
 fi
 
 case "${XBPS_TARGET_MACHINE}" in
-	x86_64-musl) CFLAGS="-D_FILE_OFFSET_BITS=64 -DLARGEFILE_SOURCE=1";;
+	x86_64-musl)
+		# FIXME: error: variable 'fp' has initializer but incomplete type
+		make_check=no # https://github.com/neomutt/neomutt/issues/3865
+		CFLAGS="-D_FILE_OFFSET_BITS=64 -DLARGEFILE_SOURCE=1"
+		;;
+	*-musl)
+		make_check=no # Same as in the x86_64-musl condition
+		;;
 	# Inquiry: Do we have largefile support on everywhere?
 esac
 
 post_install() {
 	# move dist to examples dir
-	vsconf contrib/samples/gpg.rc Muttrc.gpg.dist
+	vsconf contrib/oauth2/mutt_oauth2.py Muttrc.mutt_oauth2.dist
+	vsconf contrib/vim-keys/vim-keys.rc Muttrc.vim-keys.dist
+	vsconf contrib/smime_keys Muttrc.smime_keys.dist
 }
 
 pre_check() {