diff --git a/community/autofs/APKBUILD b/community/autofs/APKBUILD
index d6f670c9d53..af2f28ece96 100644
--- a/community/autofs/APKBUILD
+++ b/community/autofs/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Alex Laskin <alex@lask.in>
 pkgname=autofs
 pkgver=5.1.8
-pkgrel=4
+pkgrel=5
 pkgdesc="A kernel-based automounter for Linux"
 url="https://www.kernel.org/pub/linux/daemons/autofs/"
 arch="all"
@@ -20,20 +20,15 @@ makedepends="
 subpackages="$pkgname-dbg $pkgname-doc $pkgname-openrc"
 options="!check" # no test suite provided
 source="
-	https://www.kernel.org/pub/linux/daemons/$pkgname/v5/$pkgname-$pkgver.tar.xz
+	https://www.kernel.org/pub/linux/daemons/autofs/v5/autofs-$pkgver.tar.xz
 	autofs.initd
 	autofs.confd
 	0001-auto.master-change-paths-in-etc.patch
 	0002-musl-backport-fixes.patch
 	fix-segfault.patch
+	basename.patch
 	"
 
-prepare() {
-	default_prepare
-	sed -i 's,nfs/nfs.h,linux/nfs.h,g' */*.[ch]
-	sed -i 's,__S_IEXEC,S_IXUSR,g' */*.[ch]
-}
-
 build() {
 	./configure \
 		--prefix=/usr \
@@ -72,4 +67,5 @@ e7ffe40cf5f302f7de7cc59752699adad4be89fa78fa1a79c32ce4059ec2f563c0f107ca2cec850c
 562607fb77347680740a73242390cd199595779acd96033b7b9b4579ef57e8fc887bbcee227964ffeda1710798becd58e957e28c4dd875f2402c9d3989a04aef  0001-auto.master-change-paths-in-etc.patch
 e928f89147d29374b1daa97331a2aca858a2ac6de3f91e041806ebbc12ddc861d801921e20d3da3968f154bfbf916456c0cb98ac430b9dd515159436eb135f39  0002-musl-backport-fixes.patch
 c705d6cb7be2701bfbbafc01b476e32bc61e26a164002395271dc9bd4175dc6a3d580ad99dbed8d5037ef2fd603aa2530955899258386693905d8e33f7d036c7  fix-segfault.patch
+bfdd01c24afbcb8a9c8d10c3b7b18bd729e4fe93e4f650cdbc55cc9b0f74446cb5f8b373b6d84ae2595b7302b4491591aaae2ae9492d8b126bfdbfaf8794deda  basename.patch
 "
diff --git a/community/autofs/basename.patch b/community/autofs/basename.patch
new file mode 100644
index 00000000000..ae1b56d500f
--- /dev/null
+++ b/community/autofs/basename.patch
@@ -0,0 +1,34 @@
+diff -Naur a/daemon/automount.c b/daemon/automount.c
+--- a/daemon/automount.c	2024-09-03 06:37:51.526857521 -0400
++++ b/daemon/automount.c	2024-09-03 06:39:19.908662819 -0400
+@@ -33,7 +33,7 @@
+ #include <sys/time.h>
+ #include <sys/resource.h>
+ #include <sys/poll.h>
+-#include <dirent.h>
++#include <libgen.h>
+ #include <sys/vfs.h>
+ #include <sys/utsname.h>
+ #ifdef WITH_SYSTEMD
+diff -Naur a/daemon/master.c b/daemon/master.c
+--- a/daemon/master.c	2024-09-03 06:37:51.526857521 -0400
++++ b/daemon/master.c	2024-09-03 06:39:43.965820873 -0400
+@@ -25,6 +25,7 @@
+ #include <sys/types.h>
+ #include <sys/stat.h>
+ #include <ctype.h>
++#include <libgen.h>
+ #include "automount.h"
+ 
+ /* The root of the map entry tree */
+diff -Naur a/modules/lookup_file.c b/modules/lookup_file.c
+--- a/modules/lookup_file.c	2024-09-03 06:37:51.540191127 -0400
++++ b/modules/lookup_file.c	2024-09-03 06:40:24.059961561 -0400
+@@ -20,6 +20,7 @@
+ #include <time.h>
+ #include <ctype.h>
+ #include <signal.h>
++#include <libgen.h>
+ #include <sys/param.h>
+ #include <sys/types.h>
+ #include <sys/stat.h>