diff --git a/main/busybox/APKBUILD b/main/busybox/APKBUILD
index 03f0a1612bc31e9452da1ef0d4873676e2786de2..c8c3c69f3714c2435d0a54c63ae8389fdae0d886 100644
--- a/main/busybox/APKBUILD
+++ b/main/busybox/APKBUILD
@@ -4,13 +4,13 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=busybox
 pkgver=1.33.0
-pkgrel=2
+pkgrel=3
 pkgdesc="Size optimized toolbox of many common UNIX utilities"
 url="https://busybox.net/"
 arch="all"
 license="GPL-2.0-only"
 makedepends_build="perl"
-makedepends_host="linux-headers openssl-dev libtls-standalone-dev"
+makedepends_host="linux-headers libretls-dev"
 makedepends="$makedepends_build $makedepends_host"
 checkdepends="zip"
 provides="/bin/sh"
@@ -79,8 +79,8 @@ build() {
 
 	msg "Building ssl_client"
 	# shellcheck disable=SC2046  # Allow wordsplitting for pkg-config
-	${CC:-${CROSS_COMPILE}gcc} ${CPPFLAGS} ${CFLAGS} $(pkg-config --cflags libtls-standalone) \
-		"$srcdir"/ssl_client.c -o "$_dyndir"/ssl_client ${LDFLAGS} $(pkg-config --libs libtls-standalone)
+	${CC:-${CROSS_COMPILE}gcc} ${CPPFLAGS} ${CFLAGS} $(pkg-config --cflags libtls) \
+		"$srcdir"/ssl_client.c -o "$_dyndir"/ssl_client ${LDFLAGS} $(pkg-config --libs libtls)
 
 	# no timestamp in build
 	export KCONFIG_NOTIMESTAMP=1
diff --git a/testing/libretls/APKBUILD b/main/libretls/APKBUILD
similarity index 78%
rename from testing/libretls/APKBUILD
rename to main/libretls/APKBUILD
index 8cd80349818f21cd78b118f6ad980363097b70bc..19056021aabd022571b3cc7fb01654712ae8eed4 100644
--- a/testing/libretls/APKBUILD
+++ b/main/libretls/APKBUILD
@@ -3,12 +3,15 @@
 pkgname=libretls
 pkgver=3.3.1
 pkgrel=0
-pkgdesc="Port of libtls from LibreSSL to OpenSSL. Aims to make the libtls API more easily and widely available"
+pkgdesc="Port of libtls from LibreSSL to OpenSSL"
 arch="all"
 url="https://git.causal.agency/libretls/"
 license="ISC AND (BSD-3-Clause OR MIT)"
 options="!check" # No test suite
-makedepends="openssl-dev"
+provides="libtls-standalone"
+depends="ca-certificates-bundle"
+depends_dev="openssl-dev"
+makedepends="$depends_dev"
 subpackages="$pkgname-doc $pkgname-static $pkgname-dev"
 source="https://causal.agency/libretls/libretls-$pkgver.tar.gz"
 
diff --git a/main/openntpd/APKBUILD b/main/openntpd/APKBUILD
index 679dfbb2c860393613cc5d75d03ed55465512a8c..fd3f2c0fc127a308f911bdd8b280e5ad7e009214 100644
--- a/main/openntpd/APKBUILD
+++ b/main/openntpd/APKBUILD
@@ -2,20 +2,20 @@
 pkgname=openntpd
 pkgver=6.8_p1
 _pkgver=${pkgver/_/}
-pkgrel=0
+pkgrel=1
 pkgdesc="Lightweight NTP server ported from OpenBSD"
 url="http://www.openntpd.org/"
-subpackages="openntpd-doc"
-makedepends="libtls-standalone-dev linux-headers bsd-compat-headers
+makedepends="libretls-dev linux-headers bsd-compat-headers
 	autoconf automake libtool byacc"
 arch="all"
 license="ISC"
-options="!check"
+options="!check" # no test suite
+subpackages="$pkgname-doc $pkgname-openrc"
 source="https://ftp.openbsd.org/pub/OpenBSD/OpenNTPD/openntpd-$_pkgver.tar.gz
-	ntp-user.patch
-	libtls-standalone.patch
 	$pkgname.confd
 	$pkgname.initd
+	ntp-user.patch
+	libretls.patch
 	"
 builddir="$srcdir/$pkgname-$_pkgver"
 
@@ -49,7 +49,7 @@ package() {
 }
 
 sha512sums="200056bedb9c757aae1ce5d3f6655175ec058cb479429fe4704955f3a3fa15e8a9cb578ae4898ddb4cfc08c9742bbab6a7c92b5e569f06a148e40c448360b58f  openntpd-6.8p1.tar.gz
-290311e5cd074d5bd1e6374ba9b4776e4acf792d47011c43412e236766b73be2b0e5f0091bd3ad79d0b637754531889b199e66c64952765bbcd1bade0d2ebe94  ntp-user.patch
-4b27edb9b778a8a0437735e010f0606cd03a46d10bb054a6527929d46de44ba470bc81017cb2a61956fc8049879e498aadf545a89a35be1237e26eeac98ef3e3  libtls-standalone.patch
 01c3d9ed18741981fb2d8ebb509cd71801b57f57fcac48ed727687a6402dbad8a791ace1e63c0069a07b0dbcbc98c917885c942dab9616d25dde429f1fb9c348  openntpd.confd
-009eb7c7cf290c9302d9585ce7dffb2195e7e73c8bd3274b158efde10b537919c5dc4a47038f2fca6d650bcd79e8333395faa06d98f28327a328368fd59a1618  openntpd.initd"
+009eb7c7cf290c9302d9585ce7dffb2195e7e73c8bd3274b158efde10b537919c5dc4a47038f2fca6d650bcd79e8333395faa06d98f28327a328368fd59a1618  openntpd.initd
+290311e5cd074d5bd1e6374ba9b4776e4acf792d47011c43412e236766b73be2b0e5f0091bd3ad79d0b637754531889b199e66c64952765bbcd1bade0d2ebe94  ntp-user.patch
+39fa6ce478842545e32c436f942e4fe79c4d2f9cb3ca6dc6440e91248d18b5edeba0f9e7a14039be1d0aeababa2c6cdd388752e99f055c96031240f752f115a4  libretls.patch"
diff --git a/main/openntpd/libtls-standalone.patch b/main/openntpd/libretls.patch
similarity index 61%
rename from main/openntpd/libtls-standalone.patch
rename to main/openntpd/libretls.patch
index 3b5d8e405366dc533c10aad2bcd3572dd9a3193b..c3e492862730e90873ae24e17ccbcaf99e209850 100644
--- a/main/openntpd/libtls-standalone.patch
+++ b/main/openntpd/libretls.patch
@@ -1,17 +1,13 @@
-diff --git a/configure.ac b/configure.ac
-index 88884c2..b0c0697 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -60,8 +60,13 @@ AM_CONDITIONAL([HAVE_CLOCK_GETRES], [test "x$ac_cv_func_clock_getres" = xyes])
+@@ -60,8 +60,11 @@ AM_CONDITIONAL([HAVE_CLOCK_GETRES], [test "x$ac_cv_func_clock_getres" = xyes])
  AM_CONDITIONAL([HAVE_CLOCK_GETTIME], [test "x$ac_cv_func_clock_gettime" = xyes])
  
  # check for libtls
 -AC_SEARCH_LIBS([tls_config_set_ca_mem],[tls],
 -	       [LIBS="$LIBS -ltls -lssl -lcrypto"],,[-lssl -lcrypto])
-+PKG_CHECK_MODULES([LIBTLS], [libtls],[],[
-+	PKG_CHECK_MODULES([LIBTLS], [libtls-standalone])
-+	])
-+AC_SEARCH_LIBS([tls_config_set_ca_mem],[tls tls-standalone],
++PKG_CHECK_MODULES([LIBTLS], [libtls])
++AC_SEARCH_LIBS([tls_config_set_ca_mem],[tls],
 +	       [LIBS="$LIBS $LIBTLS_LIBS"
 +	       CFLAGS="$CFLAGS $LIBTLS_CFLAGS"],
 +	       ,[$LIBTLS_LIBS])
diff --git a/testing/codemadness-frontends/APKBUILD b/testing/codemadness-frontends/APKBUILD
index 2a2a4b501b775568d31028bbdb5029be8c5434ac..55babe3c5370efb53918100c66dedb52a773df84 100644
--- a/testing/codemadness-frontends/APKBUILD
+++ b/testing/codemadness-frontends/APKBUILD
@@ -1,12 +1,12 @@
 # Maintainer: Miles Alan <m@milesalan.com>
 pkgname=codemadness-frontends
 pkgver=0.4
-pkgrel=1
+pkgrel=2
 pkgdesc="Experimental (cli, web, and gopher) frontends for youtube, reddit, & duckduckgo"
 url="https://www.codemadness.org/idiotbox.html"
 arch="all"
 license="ISC"
-makedepends="libtls-standalone-dev"
+makedepends="libretls-dev"
 options="!check" # Has no tests
 source="$pkgname-$pkgver.tar.gz::https://codemadness.org/releases/frontends/frontends-$pkgver.tar.gz"
 builddir="$srcdir/frontends-$pkgver"
@@ -19,9 +19,9 @@ prepare() {
 
 build() {
 	make \
-		LIBTLS_LDFLAGS="$(pkg-config --libs libtls-standalone)" \
-		LIBTLS_LDFLAGS_STATIC="$(pkg-config --libs --static libtls-standalone)" \
-		CFLAGS="${CFLAGS} $(pkg-config --cflags libtls-standalone)"
+		LIBTLS_LDFLAGS="$(pkg-config --libs libtls)" \
+		LIBTLS_LDFLAGS_STATIC="$(pkg-config --libs --static libtls)" \
+		CFLAGS="${CFLAGS} $(pkg-config --cflags libtls)"
 }
 
 package() {
@@ -36,5 +36,4 @@ package() {
 	install -Dm755 reddit/cli $pkgdir/usr/bin/reddit-cli
 }
 
-
 sha512sums="bc3c22a6bcf0ea99851efbffa2523a7169b6fcc1ba1ec4747fd776bd5df41d1b395c97019fd59415c5092577f3542f8696edde13331167588b3341b8929c627f  codemadness-frontends-0.4.tar.gz"
diff --git a/main/libtls-standalone/APKBUILD b/unmaintained/libtls-standalone/APKBUILD
similarity index 100%
rename from main/libtls-standalone/APKBUILD
rename to unmaintained/libtls-standalone/APKBUILD
diff --git a/main/libtls-standalone/Makefile b/unmaintained/libtls-standalone/Makefile
similarity index 100%
rename from main/libtls-standalone/Makefile
rename to unmaintained/libtls-standalone/Makefile
diff --git a/main/libtls-standalone/libtls-ciphers.patch b/unmaintained/libtls-standalone/libtls-ciphers.patch
similarity index 100%
rename from main/libtls-standalone/libtls-ciphers.patch
rename to unmaintained/libtls-standalone/libtls-ciphers.patch
diff --git a/main/libtls-standalone/openssl-1.1.0-asn1-string.patch b/unmaintained/libtls-standalone/openssl-1.1.0-asn1-string.patch
similarity index 100%
rename from main/libtls-standalone/openssl-1.1.0-asn1-string.patch
rename to unmaintained/libtls-standalone/openssl-1.1.0-asn1-string.patch
diff --git a/main/libtls-standalone/openssl-1.1.0-bio-method.patch b/unmaintained/libtls-standalone/openssl-1.1.0-bio-method.patch
similarity index 100%
rename from main/libtls-standalone/openssl-1.1.0-bio-method.patch
rename to unmaintained/libtls-standalone/openssl-1.1.0-bio-method.patch
diff --git a/main/libtls-standalone/openssl-1.1.0-verify-param.patch b/unmaintained/libtls-standalone/openssl-1.1.0-verify-param.patch
similarity index 100%
rename from main/libtls-standalone/openssl-1.1.0-verify-param.patch
rename to unmaintained/libtls-standalone/openssl-1.1.0-verify-param.patch
diff --git a/main/libtls-standalone/openssl-1.1.0-x509-object.patch b/unmaintained/libtls-standalone/openssl-1.1.0-x509-object.patch
similarity index 100%
rename from main/libtls-standalone/openssl-1.1.0-x509-object.patch
rename to unmaintained/libtls-standalone/openssl-1.1.0-x509-object.patch
diff --git a/main/libtls-standalone/test_program.c b/unmaintained/libtls-standalone/test_program.c
similarity index 100%
rename from main/libtls-standalone/test_program.c
rename to unmaintained/libtls-standalone/test_program.c
diff --git a/main/libtls-standalone/tls_compat.c b/unmaintained/libtls-standalone/tls_compat.c
similarity index 100%
rename from main/libtls-standalone/tls_compat.c
rename to unmaintained/libtls-standalone/tls_compat.c
diff --git a/main/libtls-standalone/tls_compat.h b/unmaintained/libtls-standalone/tls_compat.h
similarity index 100%
rename from main/libtls-standalone/tls_compat.h
rename to unmaintained/libtls-standalone/tls_compat.h