diff --git a/templates/OpenRC/files/inittab b/templates/OpenRC/files/inittab
deleted file mode 100644
index d77cc85d815..00000000000
--- a/templates/OpenRC/files/inittab
+++ /dev/null
@@ -1,34 +0,0 @@
-# /etc/inittab:  This file describes how the INIT process should set up
-#                the system in a certain run-level.
-
-# Default runlevel.
-id:3:initdefault:
-
-# System initialization, mount local filesystems, etc.
-si::sysinit:/sbin/rc sysinit
-
-# Further system initialization, brings up the boot runlevel.
-rc::bootwait:/sbin/rc boot
-
-l0:0:wait:/sbin/rc shutdown 
-l1:S1:wait:/sbin/rc single
-l2:2:wait:/sbin/rc nonetwork
-l3:3:wait:/sbin/rc default
-l4:4:wait:/sbin/rc default
-l5:5:wait:/sbin/rc default
-l6:6:wait:/sbin/rc reboot
-
-# TERMINALS
-c1:12345:respawn:/sbin/agetty -8 38400 tty1 linux
-c2:2345:respawn:/sbin/agetty -8 38400 tty2 linux
-c3:2345:respawn:/sbin/agetty -8 38400 tty3 linux
-c4:2345:respawn:/sbin/agetty -8 38400 tty4 linux
-c5:2345:respawn:/sbin/agetty -8 38400 tty5 linux
-c6:2345:respawn:/sbin/agetty -8 38400 tty6 linux
-
-# SERIAL CONSOLES
-#s0:12345:respawn:/sbin/agetty 9600 ttyS0 vt100
-#s1:12345:respawn:/sbin/agetty 9600 ttyS1 vt100
-
-# What to do at the "Three Finger Salute".
-ca:12345:ctrlaltdel:/sbin/shutdown -r now
diff --git a/templates/OpenRC/files/shutdown.in b/templates/OpenRC/files/shutdown.in
deleted file mode 100644
index 12f0f5f0b59..00000000000
--- a/templates/OpenRC/files/shutdown.in
+++ /dev/null
@@ -1,18 +0,0 @@
-#!@PREFIX@/sbin/runscript
-
-description="Shutdown or reboot the system"
-
-depend()
-{
-	keyword noprefix
-	after *
-}
-
-start()
-{
-	if [ "${RC_RUNLEVEL}" = "shutdown" ]; then
-		yesno "$RC_REBOOT" && reboot -d -f -i
-		poweroff -d -f -h -i
-	fi
-
-}
diff --git a/templates/OpenRC/install.diff b/templates/OpenRC/install.diff
new file mode 100644
index 00000000000..91a0aadb562
--- /dev/null
+++ b/templates/OpenRC/install.diff
@@ -0,0 +1,11 @@
+--- support/sysvinit/inittab.orig	2009-05-07 12:03:07.533948107 +0000
++++ support/sysvinit/inittab	2009-05-07 12:04:45.178070711 +0000
+@@ -18,7 +18,7 @@ l3:3:wait:/sbin/rc default
+ l4:4:wait:/sbin/rc default
+ l5:5:wait:/sbin/rc default
+ l6:6:wait:/sbin/rc reboot
+-l6r:6:wait:/sbin/reboot -dk
++l6r:6:wait:/sbin/reboot -dfi
+ #z6:6:respawn:/sbin/sulogin
+ 
+ # new-style single-user
diff --git a/templates/OpenRC/template b/templates/OpenRC/template
index 8ed4dea0f0e..91c5c180e05 100644
--- a/templates/OpenRC/template
+++ b/templates/OpenRC/template
@@ -1,14 +1,12 @@
 # Template file for 'OpenRC'
 pkgname=OpenRC
-version=20090506
+version=20090507
 wrksrc=openrc
-revision=1
-patch_files="xbps-changes.diff"
 distfiles="http://ftp.gnu.org/gnu/openrc/openrc-$version.tar.bz2"
 build_style=gnu_makefile
 short_desc="Universal init system"
 maintainer="Juan RP <xtraeme@gmail.com>"
-checksum=273e0548826b4633f2bfea8a25a9b79c6d71231ae206fc0207d0f45af08be7ce
+checksum=093a15dbbb0b30cb618fc8e11ee4e67b985a0e8bd536728ea343ebdb03d462fc
 long_desc="
  OpenRC is a dependency based init system that works with the system
  provided init program, normally /sbin/init. It is not a replacement for
@@ -29,9 +27,6 @@ Add_dependency full sysvinit
 
 pre_configure()
 {
-	# Provide a shutdown service.
-	cp ${FILESDIR}/shutdown.in ${wrksrc}/init.d
-
 	# Fix path for kbd stuff.
 	for f in init.d/consolefont.in conf.d/consolefont; do
 		sed -i -e "s|/usr/share/consolefonts|/lib/kbd/consolefonts|g" \
@@ -41,5 +36,6 @@ pre_configure()
 
 post_install()
 {
-	install -D -m755 ${FILESDIR}/inittab ${DESTDIR}/etc/inittab
+	install -D -m755 ${wrksrc}/support/sysvinit/inittab \
+		${DESTDIR}/etc/inittab
 }
diff --git a/templates/OpenRC/xbps-changes.diff b/templates/OpenRC/xbps-changes.diff
deleted file mode 100644
index fc7ed4aa85a..00000000000
--- a/templates/OpenRC/xbps-changes.diff
+++ /dev/null
@@ -1,20 +0,0 @@
-Adds the shutdown service.
-
---- init.d/Makefile.Linux.orig	2009-05-02 23:22:58.456719613 +0200
-+++ init.d/Makefile.Linux	2009-05-02 23:23:11.172882585 +0200
-@@ -2,7 +2,7 @@ NET_LO=	net.lo
- 
- SRCS+=	devfs.in dmesg.in hwclock.in consolefont.in keymaps.in killprocs.in \
- 	modules.in mount-ro.in mtab.in numlock.in procfs.in sysfs.in \
--	termencoding.in
-+	termencoding.in shutdown.in
- 
- .SUFFIXES:	.Linux.in
- .Linux.in:
---- runlevels/Makefile.Linux.orig	2009-05-02 23:27:32.089940526 +0200
-+++ runlevels/Makefile.Linux	2009-05-02 23:27:42.565715104 +0200
-@@ -1,3 +1,3 @@
- SYSINIT+=	devfs dmesg
- BOOT+=		hwclock keymaps modules mtab procfs termencoding
--SHUTDOWN+=	killprocs mount-ro
-+SHUTDOWN+=	killprocs mount-ro shutdown