diff --git a/testing/ocaml-cmdliner/APKBUILD b/testing/ocaml-cmdliner/APKBUILD
new file mode 100644
index 0000000000000000000000000000000000000000..8e4777cda937b11cba626e59e98bbbf87de00a7d
--- /dev/null
+++ b/testing/ocaml-cmdliner/APKBUILD
@@ -0,0 +1,52 @@
+# Contributor: Jakub Jirutka <jakub@jirutka.cz>
+# Maintainer:
+pkgname=ocaml-cmdliner
+_pkgname=cmdliner
+pkgver=1.1.1
+pkgrel=0
+pkgdesc="Declarative definition of command line interfaces for OCaml"
+url="https://erratique.ch/software/cmdliner"
+arch="all !riscv64"  # limited by ocaml aport
+license="ISC"
+depends="ocaml-result ocaml-runtime"
+depends_dev="$pkgname=$pkgver-r$pkgrel"
+makedepends="ocaml ocaml-findlib ocaml-result-dev ocamlbuild"
+options="!check"  # no tests provided
+subpackages="$pkgname-dev"
+source="$pkgname-$pkgver.tar.bz2::https://erratique.ch/software/cmdliner/releases/cmdliner-$pkgver.tbz"
+builddir="$srcdir/$_pkgname-$pkgver"
+
+# 32-bit archs
+case "$CARCH" in
+	arm*|x86) options="$options textrels" ;;
+esac
+
+build() {
+	make -j1
+}
+
+package() {
+	make install DESTDIR="$pkgdir" PREFIX=/usr
+}
+
+dev() {
+	default_dev
+
+	cd "$pkgdir"
+
+	local path; for path in $(find usr/lib/ocaml \( \
+			-name '*.cmt' -o \
+			-name '*.cmti' -o \
+			-name '*.cmx' -o \
+			-name '*.cmxa' -o \
+			-name '*.ml' -o \
+			-name '*.mli' \
+		\))
+	do
+		amove "$path"
+	done
+}
+
+sha512sums="
+5478ad833da254b5587b3746e3a8493e66e867a081ac0f653a901cc8a7d944f66e4387592215ce25d939be76f281c4785702f54d4a74b1700bc8838a62255c9e  ocaml-cmdliner-1.1.1.tar.bz2
+"
diff --git a/unmaintained/ocaml-cmdliner/APKBUILD b/unmaintained/ocaml-cmdliner/APKBUILD
deleted file mode 100644
index db71176beb2880a3b2181651b7fac6d97dce6170..0000000000000000000000000000000000000000
--- a/unmaintained/ocaml-cmdliner/APKBUILD
+++ /dev/null
@@ -1,40 +0,0 @@
-# Contributor: Jakub Jirutka <jakub@jirutka.cz>
-# Maintainer:
-pkgname=ocaml-cmdliner
-_pkgname=cmdliner
-pkgver=1.0.4
-pkgrel=1
-pkgdesc="Declarative definition of command line interfaces for OCaml"
-url="http://erratique.ch/software/cmdliner"
-arch="all !x86 !armhf !armv7 !s390x !mips !mips64"  # limited by ocaml aport
-license="ISC"
-depends="ocaml-result ocaml-runtime"
-depends_dev="$pkgname=$pkgver-r$pkgrel"
-makedepends="ocaml ocaml-findlib ocaml-result-dev ocamlbuild"
-options="!check"  # no tests provided
-subpackages="$pkgname-dev"
-source="$pkgname-$pkgver.tar.gz::https://github.com/dbuenzli/$_pkgname/archive/v$pkgver.tar.gz"
-builddir="$srcdir/$_pkgname-$pkgver"
-
-build() {
-	make -j1
-}
-
-package() {
-	make install DESTDIR="$pkgdir" PREFIX=/usr
-
-	# Remove annotation files.
-	rm -Rf "$pkgdir"/usr/lib/ocaml/$_pkgname/*.cmt*
-}
-
-dev() {
-	local sitelib="usr/lib/ocaml/$_pkgname"
-	default_dev
-
-	cd "$pkgdir"/$sitelib
-
-	mkdir -p "$subpkgdir"/$sitelib
-	mv *.cmx *.cmxa *.mli "$subpkgdir"/$sitelib/
-}
-
-sha512sums="d8d2408fa2606295ec4cc1662f38a9ad675e009f948cac8e87354abf160b37e316969a24e3caf81b5a296eebbdc178f8a1655afcaf3840be71462b58337c359f  ocaml-cmdliner-1.0.4.tar.gz"