diff --git a/testing/mailutils/APKBUILD b/testing/mailutils/APKBUILD
index 30474ea5317..26a2ebe91cb 100644
--- a/testing/mailutils/APKBUILD
+++ b/testing/mailutils/APKBUILD
@@ -1,20 +1,27 @@
 # Contributor: Shiz <hi@shiz.me>
 # Maintainer: Shiz <hi@shiz.me>
 pkgname=mailutils
-pkgver=3.9
-pkgrel=2
+pkgver=3.16
+pkgrel=0
 pkgdesc="GNU swiss army knife of electronic mail handling"
 url="https://mailutils.org/"
 arch="all !s390x"
 license="GPL-3.0-or-later"
 replaces="mailx"
 depends_dev="$pkgname-libs=$pkgver-r$pkgrel"
-makedepends="readline-dev libtool"
-checkdepends="autoconf"
+makedepends="
+	libunistring-dev
+	libtool
+	gnutls-dev
+	readline-dev
+	"
+checkdepends="autoconf netcat-openbsd"
 subpackages="$pkgname-dev $pkgname-doc $pkgname-libs $pkgname-servers $pkgname-mh"
 source="https://ftp.gnu.org/gnu/mailutils/mailutils-$pkgver.tar.xz
 	disable-koi8-r-test.patch
-	fix-build-with-gcc-10.patch"
+	"
+# they pretty much all pass, but the test suite takes an hour
+options="!check"
 
 build() {
 	./configure \
@@ -36,41 +43,35 @@ package() {
 	make DESTDIR="$pkgdir" install
 
 	cd "$pkgdir"
-	rm usr/lib/charset.alias
+	# rm usr/lib/charset.alias
 	# No need for these to be suid/sgid root.
 	chmod u-s usr/sbin/mda
 	chmod g-s usr/bin/dotlock
 }
 
-servers() {
-	pkgdesc="$pkgdesc (servers)"
-
-	mkdir -p "$subpkgdir"/usr/sbin
-	local server; for server in pop3d imap4d comsatd; do
-		mv "$pkgdir"/usr/sbin/$server "$subpkgdir"/usr/sbin/
-	done
-}
-
 libs() {
 	pkgdesc="$pkgdesc (libraries)"
 
-	mkdir -p "$subpkgdir"/usr
-	mv "$pkgdir"/usr/lib "$subpkgdir"/usr/
+	amove usr/lib
+}
+
+servers() {
+	pkgdesc="$pkgdesc (servers)"
+
+	amove \
+		usr/sbin/pop3d \
+		usr/sbin/imap4d \
+		usr/sbin/comsatd
 }
 
 mh() {
 	pkgdesc="$pkgdesc (MH compatibility)"
 
-	mkdir -p "$subpkgdir"/usr/bin \
-		"$subpkgdir"/usr/share/$pkgname
-
-	mv "$pkgdir"/usr/bin/mu-mh "$subpkgdir"/usr/bin/
-	mv "$pkgdir"/usr/share/$pkgname/mh "$subpkgdir"/usr/share/$pkgname/
-	rmdir -p "$pkgdir"/usr/share/$pkgname || true
+	amove usr/bin/mu-mh \
+		usr/share/mailutils/mh
 }
 
 sha512sums="
-1eef9bebeeafbf974e54b87705444ee02b663a86e22442a9ec5db16ade38e6e9a3079ee8a8267393e97d6e9e477917617b2e1d57d3287ab19e4df73b66e5a8d4  mailutils-3.9.tar.xz
-d0d78bba10d3ce039bb00657a570fb9411fabf448548994860285701939ae52afd15c007daa85bb18662a67153dda86069afe240b430fbe1b28a45755108f477  disable-koi8-r-test.patch
-7050e5069f82d51971096e7f3c9835a4162d593c38e7e8a60184144c985901e0092c7ab230eed340023909e3b856f2619a2c26f983f4dd9cc5397548e9e173ef  fix-build-with-gcc-10.patch
+c75015b431ca87fb19668a8c2f4da1a02be897d7bcd89cbc6a821b73c8599e51778e37c7dda4bb8a9c9aa0af521fc0bcf5f6d00383d3dd43e87ed6b9878e16ac  mailutils-3.16.tar.xz
+fd628287a8b70b84e4fe477f3fed157308f1a0e803dfd65390d90a7ad40023155559b284e29ceb95dd3c854fce4e3a22a651d8de99b49db7c9d4b3682003cf2c  disable-koi8-r-test.patch
 "
diff --git a/testing/mailutils/disable-koi8-r-test.patch b/testing/mailutils/disable-koi8-r-test.patch
index 803072148af..2d67861df43 100644
--- a/testing/mailutils/disable-koi8-r-test.patch
+++ b/testing/mailutils/disable-koi8-r-test.patch
@@ -1,7 +1,9 @@
 musl does not support this charset.
+diff --git a/libmailutils/tests/decode2047.at b/libmailutils/tests/decode2047.at
+index d255844..806d4bd 100644
 --- a/libmailutils/tests/decode2047.at
 +++ b/libmailutils/tests/decode2047.at
-@@ -49,12 +49,6 @@
+@@ -50,12 +50,6 @@ TESTDEC2047([],[decode04],
  [If you can read this yo ... u understand the example.
  ])
  
diff --git a/testing/mailutils/fix-build-with-gcc-10.patch b/testing/mailutils/fix-build-with-gcc-10.patch
deleted file mode 100644
index 74feeca9973..00000000000
--- a/testing/mailutils/fix-build-with-gcc-10.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-Otherwise doesn't compile with -fcommon.
-
-diff -upr mailutils-3.9.orig/imap4d/imap4d.h mailutils-3.9/imap4d/imap4d.h
---- mailutils-3.9.orig/imap4d/imap4d.h	2021-07-10 14:39:56.469994975 +0200
-+++ mailutils-3.9/imap4d/imap4d.h	2021-07-10 14:41:29.953368933 +0200
-@@ -229,8 +229,6 @@ extern struct mu_tls_config global_tls_c
- extern int test_mode;
- extern int silent_expunge;
- 
--int tls_available;
--
- /* Input functions */
- extern mu_stream_t iostream;
- extern int  io_untagged_response (int, const char *, ...) MU_PRINTFLIKE(2,3);
-diff -upr mailutils-3.9.orig/lib/tcpwrap.h mailutils-3.9/lib/tcpwrap.h
---- mailutils-3.9.orig/lib/tcpwrap.h	2021-07-10 14:39:56.526661667 +0200
-+++ mailutils-3.9/lib/tcpwrap.h	2021-07-10 14:40:13.370002323 +0200
-@@ -17,7 +17,7 @@
- #include <mailutils/types.h>
- 
- extern int mu_tcp_wrapper_enable;
--const char *mu_tcp_wrapper_daemon;
-+extern const char *mu_tcp_wrapper_daemon;
- extern int mu_tcpwrapper_access (int fd);
- extern void mu_tcpwrapper_cfg_init (void);
- extern int mu_tcp_wrapper_prefork (int fd,