diff --git a/community/runit/APKBUILD b/community/runit/APKBUILD
index f3df2844f4e..2e64cb5cfdd 100644
--- a/community/runit/APKBUILD
+++ b/community/runit/APKBUILD
@@ -7,7 +7,7 @@ pkgdesc="UNIX init scheme with service supervision"
 url="http://smarden.org/runit/"
 arch="all"
 license="BSD"
-subpackages="$pkgname-doc"
+subpackages="$pkgname-doc $pkgname-openrc"
 source="http://smarden.org/runit/runit-$pkgver.tar.gz
 	run-service-dir.patch
 	svlogd-udp.patch
@@ -17,22 +17,18 @@ source="http://smarden.org/runit/runit-$pkgver.tar.gz
 builddir="$srcdir/admin/runit-$pkgver/src"
 
 build() {
-	cd "$builddir"
 	make
 }
 
 package() {
-	cd "$builddir"
 	install -d "$pkgdir"/sbin
 	for i in chpst runit runit-init runsv runsvchdir runsvdir sv svlogd utmpset; do
-		install -m755 "$i" "$pkgdir"/sbin/$i || return 1
+		install -m755 "$i" "$pkgdir"/sbin/$i
 	done
 	install -d "$pkgdir"/usr/share/man/man8
 	cd .. && cp -rf man/* "$pkgdir"/usr/share/man/man8/
-	install -m755 -D "$srcdir"/$pkgname.initd \
-                "$pkgdir"/etc/init.d/runitd || return 1
-	install -Dm644 "$srcdir"/README.alpine \
-                "$pkgdir"/usr/share/doc/$pkgname/README.alpine || return 1
+	install -m755 -D "$srcdir"/$pkgname.initd "$pkgdir"/etc/init.d/runitd
+	install -Dm644 "$srcdir"/README.alpine -t "$pkgdir"/usr/share/doc/$pkgname
 	mkdir -p "$pkgdir"/etc/service
 	mkdir -p "$pkgdir"/etc/sv
 }