diff --git a/main/alpine-baselayout/APKBUILD b/main/alpine-baselayout/APKBUILD
index e89705e76f18df542258d9ad9e33b61f23531efc..5ff50cf19db0c139fe348df98066295aa407a18b 100644
--- a/main/alpine-baselayout/APKBUILD
+++ b/main/alpine-baselayout/APKBUILD
@@ -1,7 +1,7 @@
 # Contributor: Sören Tempel <soeren+alpine@soeren-tempel.net>
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=alpine-baselayout
-pkgver=3.6.4
+pkgver=3.6.5
 pkgrel=0
 pkgdesc="Alpine base dir structure and init scripts"
 url="https://git.alpinelinux.org/cgit/aports/tree/main/alpine-baselayout"
diff --git a/main/alpine-baselayout/alpine-baselayout.post-install b/main/alpine-baselayout/alpine-baselayout.post-install
index 7cfe97d6357954a25c9a4482ff4adb3e96d96dfa..88966d35c3327efc03e5d383fa577782ea256c5d 100644
--- a/main/alpine-baselayout/alpine-baselayout.post-install
+++ b/main/alpine-baselayout/alpine-baselayout.post-install
@@ -9,6 +9,6 @@ esac
 # the /etc/group file is created after /etc/shadow. Needed to apply the group
 # properly.
 chown root:shadow etc/shadow
-chown root:shadow etc/shadow-
+[ -e etc/shadow- ] && chown root:shadow etc/shadow-
 
 exit 0