diff --git a/extra-repos/systemd/linux-pam/APKBUILD b/extra-repos/systemd/linux-pam-pmos/APKBUILD
similarity index 92%
rename from extra-repos/systemd/linux-pam/APKBUILD
rename to extra-repos/systemd/linux-pam-pmos/APKBUILD
index 4bf1fd041..88f1d5ed4 100644
--- a/extra-repos/systemd/linux-pam/APKBUILD
+++ b/extra-repos/systemd/linux-pam-pmos/APKBUILD
@@ -1,12 +1,9 @@
 # Forked from Alpine enable systemd
 # MODIFIED base-sessionl.pamd for systemd!
 
-pkgname=linux-pam
-# MUST be kept in sync to avoid accidentally pulling in the alpine version
-# we hard depend on this exact version in postmarketos-base-systemd. When updating
-# the package here it must also be updated in postmarketos-base-systemd.
+pkgname=linux-pam-pmos
 pkgver=1.6.1
-pkgrel=1
+pkgrel=0
 pkgdesc="Linux PAM (Pluggable Authentication Modules for Linux)"
 url="https://www.kernel.org/pub/linux/libs/pam"
 arch="all"
@@ -63,6 +60,8 @@ build() {
 }
 
 package() {
+	provides="linux-pam=$pkgver-r$pkgrel"
+
 	make DESTDIR="$pkgdir" install
 
 	# install our pam.d files
@@ -81,12 +80,23 @@ package() {
 		&& chmod g+s "$pkgdir"/sbin/unix_chkpwd
 }
 
+dev() {
+	default_dev
+	provides="$provides linux-pam-dev=$pkgver-r$pkgrel"
+}
+
 manual() {
+	provides="$provides linux-pam-manual=$pkgver-r$pkgrel"
 	pkgdesc="$pkgdesc (manual)"
 
 	amove usr/share/doc/Linux-PAM
 }
 
+doc() {
+	default_doc
+	provides="$provides linux-pam-doc=$pkgver-r$pkgrel"
+}
+
 sha512sums="
 ddb5a5f296f564b76925324550d29f15d342841a97815336789c7bb922a8663e831edeb54f3dcd1eaf297e3325c9e2e6c14b8740def5c43cf3f160a8a14fa2ea  Linux-PAM-1.6.1.tar.xz
 c6054ec6832f604c0654cf074e4e241c44037fd41cd37cca7da94abe008ff72adc4466d31bd254517eda083c7ec3f6aefd37785b3ee3d0d4553250bd29963855  Linux-PAM-1.6.1-docs.tar.xz
diff --git a/extra-repos/systemd/linux-pam/base-account.pamd b/extra-repos/systemd/linux-pam-pmos/base-account.pamd
similarity index 100%
rename from extra-repos/systemd/linux-pam/base-account.pamd
rename to extra-repos/systemd/linux-pam-pmos/base-account.pamd
diff --git a/extra-repos/systemd/linux-pam/base-auth.pamd b/extra-repos/systemd/linux-pam-pmos/base-auth.pamd
similarity index 100%
rename from extra-repos/systemd/linux-pam/base-auth.pamd
rename to extra-repos/systemd/linux-pam-pmos/base-auth.pamd
diff --git a/extra-repos/systemd/linux-pam/base-password.pamd b/extra-repos/systemd/linux-pam-pmos/base-password.pamd
similarity index 100%
rename from extra-repos/systemd/linux-pam/base-password.pamd
rename to extra-repos/systemd/linux-pam-pmos/base-password.pamd
diff --git a/extra-repos/systemd/linux-pam/base-session-noninteractive.pamd b/extra-repos/systemd/linux-pam-pmos/base-session-noninteractive.pamd
similarity index 100%
rename from extra-repos/systemd/linux-pam/base-session-noninteractive.pamd
rename to extra-repos/systemd/linux-pam-pmos/base-session-noninteractive.pamd
diff --git a/extra-repos/systemd/linux-pam/base-session.pamd b/extra-repos/systemd/linux-pam-pmos/base-session.pamd
similarity index 100%
rename from extra-repos/systemd/linux-pam/base-session.pamd
rename to extra-repos/systemd/linux-pam-pmos/base-session.pamd
diff --git a/extra-repos/systemd/linux-pam/login.pamd b/extra-repos/systemd/linux-pam-pmos/login.pamd
similarity index 100%
rename from extra-repos/systemd/linux-pam/login.pamd
rename to extra-repos/systemd/linux-pam-pmos/login.pamd
diff --git a/extra-repos/systemd/linux-pam/other.pamd b/extra-repos/systemd/linux-pam-pmos/other.pamd
similarity index 100%
rename from extra-repos/systemd/linux-pam/other.pamd
rename to extra-repos/systemd/linux-pam-pmos/other.pamd
diff --git a/extra-repos/systemd/linux-pam/su.pamd b/extra-repos/systemd/linux-pam-pmos/su.pamd
similarity index 100%
rename from extra-repos/systemd/linux-pam/su.pamd
rename to extra-repos/systemd/linux-pam-pmos/su.pamd
diff --git a/extra-repos/systemd/postmarketos-base-systemd/APKBUILD b/extra-repos/systemd/postmarketos-base-systemd/APKBUILD
index 5e67ed6fb..7713661bf 100644
--- a/extra-repos/systemd/postmarketos-base-systemd/APKBUILD
+++ b/extra-repos/systemd/postmarketos-base-systemd/APKBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Oliver Smith <ollipearanoid@postmarketos.org>
 # pmbootstrap installs this, if systemd is selected in "pmbootstrap init".
 pkgname=postmarketos-base-systemd
-pkgver=9
+pkgver=10
 pkgrel=0
 pkgdesc="Meta package for running postmarketOS with systemd"
 url="https://postmarketos.org"
@@ -14,7 +14,7 @@ depends="
 	systemd
 	systemd-timesyncd
 	tzdata
-	linux-pam=1.6.1-r1
+	linux-pam-pmos
 	systemd-services
 	"
 replaces="alpine-baselayout postmarketos-base systemd systemd-logind"