diff --git a/main/nnd-s6-services/APKBUILD b/main/nnd-s6-services/APKBUILD
index 3b83a78..0c6d4a5 100644
--- a/main/nnd-s6-services/APKBUILD
+++ b/main/nnd-s6-services/APKBUILD
@@ -3,7 +3,7 @@
 . ../../APKBUILD.template
 
 pkgname=nnd-s6-services
-pkgver=1.20
+pkgver=1.21
 pkgrel=0
 pkgdesc="Base services for s6"
 depends="s6-rc s6-portable-utils s6-linux-utils"
diff --git a/main/nnd-s6-services/manage.sh b/main/nnd-s6-services/manage.sh
index ad84c78..bbd30cb 100755
--- a/main/nnd-s6-services/manage.sh
+++ b/main/nnd-s6-services/manage.sh
@@ -50,6 +50,8 @@ swap() {
 dist() {
 	SDIR="$S6_DIST_PATH/rc" DPATH="$S6_RC_PATH" distdefs
 	SDIR="$S6_DIST_PATH/env" DPATH="$S6_ENV_PATH" distdefs
+	# Remove any dangling invalid symlinks
+	find -L /etc/s6/rc/ -type l -exec rm -v -- {} +
 }
 
 distdefs() {