diff --git a/testing/hamlib/APKBUILD b/testing/hamlib/APKBUILD
index 5a166a23e9a8d8db1ed82ccebe2f1762fbbcce12..51dc8c5e2d4a35bce09f76d17efb738719b954fb 100644
--- a/testing/hamlib/APKBUILD
+++ b/testing/hamlib/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Bradford D. Boyle <bradford.d.boyle@gmail.com>
 pkgname=hamlib
 pkgver=4.4
-pkgrel=1
+pkgrel=2
 pkgdesc="Library to control radio transceivers and receivers"
 url="https://hamlib.github.io/"
 arch="all"
@@ -26,23 +26,19 @@ package() {
 	make DESTDIR="$pkgdir" install
 	rm -f "$pkgdir"/usr/lib/*.a
 	rm -f "$pkgdir"/usr/lib/tcl8.6/Hamlib/hamlibtcl.a
+
+	find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete
+	chrpath --delete "$pkgdir"/usr/lib/perl5/site_perl/auto/Hamlib/Hamlib.so
+	rm -f "$pkgdir"/usr/lib/perl5/site_perl/perltest.pl
+	rm -Rf "$pkgdir"/usr/lib/perl5/core_perl
+	mv "$pkgdir"/usr/lib/perl5/site_perl "$pkgdir"/usr/lib/perl5/vendor_perl
 }
 
 perl() {
 	pkgdesc="Perl bindings for $pkgname"
 	depends="perl"
 
-	mkdir -p "$subpkgdir"/usr/lib
-	mv "$pkgdir"/usr/lib/perl5 "$subpkgdir"/usr/lib/
-
-	# fix perl module location
-	cd "$subpkgdir"/usr/lib/perl5/site_perl/
-	mkdir current
-	mv auto current
-	mv Hamlib.pm current
-	rm perltest.pl
-
-	chrpath --delete "$subpkgdir"/usr/lib/perl5/site_perl/current/auto/Hamlib/Hamlib.so
+	amove usr/lib/perl5
 }
 
 py3() {
@@ -53,8 +49,9 @@ py3() {
 }
 
 tcl() {
-	mkdir -p "$subpkgdir"/usr/lib
-	mv "$pkgdir"/usr/lib/tcl8.6 "$subpkgdir"/usr/lib/
+	pkgdesc="Tcl bindings for $pkgname"
+
+	amove usr/lib/tcl8.6
 }
 
 sha512sums="