diff --git a/srcpkgs/rpi-base/files/bcm_host.pc b/srcpkgs/rpi-base/files/bcm_host.pc
new file mode 100644
index 0000000000..3cb841caba
--- /dev/null
+++ b/srcpkgs/rpi-base/files/bcm_host.pc
@@ -0,0 +1,11 @@
+prefix=/opt/vc
+exec_prefix=${prefix}
+libdir=${exec_prefix}/lib
+includedir=${prefix}/include
+
+Name: bcm_host
+Description: Broadcom VideoCore host API library
+Version: 1
+Libs: -L${libdir} -lbcm_host -lvcos -lvchiq_arm
+Cflags: -I${includedir} -I${includedir}/interface/vmcs_host/linux -I${includedir}/interface/vcos/pthreads -DUSE_VCHIQ_ARM
+
diff --git a/srcpkgs/rpi-base/files/egl.pc b/srcpkgs/rpi-base/files/egl.pc
new file mode 100644
index 0000000000..52f4a515fb
--- /dev/null
+++ b/srcpkgs/rpi-base/files/egl.pc
@@ -0,0 +1,12 @@
+prefix=/opt/vc
+exec_prefix=${prefix}
+libdir=${exec_prefix}/lib
+includedir=${prefix}/include
+
+Name: EGL
+Description: Fake EGL package for RPi
+Version: 10
+Requires: bcm_host
+Libs: -L${libdir} -lEGL
+Cflags: -I${includedir}
+
diff --git a/srcpkgs/rpi-base/files/glesv2.pc b/srcpkgs/rpi-base/files/glesv2.pc
new file mode 100644
index 0000000000..901d3306fa
--- /dev/null
+++ b/srcpkgs/rpi-base/files/glesv2.pc
@@ -0,0 +1,12 @@
+prefix=/opt/vc
+exec_prefix=${prefix}
+libdir=${exec_prefix}/lib
+includedir=${prefix}/include
+
+Name: GLESv2
+Description: Fake GL ES 2 package for RPi
+Version: 10
+Requires: bcm_host
+Libs: -L${libdir} -lGLESv2
+Cflags: -I${includedir}
+
diff --git a/srcpkgs/rpi-base-files/template b/srcpkgs/rpi-base/template
similarity index 50%
rename from srcpkgs/rpi-base-files/template
rename to srcpkgs/rpi-base/template
index 479a0e04a4..233c1aa3d5 100644
--- a/srcpkgs/rpi-base-files/template
+++ b/srcpkgs/rpi-base/template
@@ -1,19 +1,27 @@
-# Template file for 'rpi-base-files'
-pkgname=rpi-base-files
-version=0.1
+# Template file for 'rpi-base'
+pkgname=rpi-base
+version=1.0
 revision=1
-short_desc="Void Linux base system files for the Raspberry Pi"
-maintainer="Juan RP <xtraeme@gmail.com>"
+noarch=yes
 homepage="http://www.voidlinux.eu"
-license="Public domain"
+short_desc="Void Linux RaspberryPi base files"
+maintainer="Juan RP <xtraeme@gmail.com>"
+license="Public Domain"
 
-# XXX only for rpi
 only_for_archs="armv6l"
-makedepends="ntp?ntp-daemon dhcpcd openssh-server"
+makedepends="ntp?ntp-daemon dhcpcd openssh-server rpi-kernel linux-firmware"
 depends="${makedepends}"
-# enable dhcpcd and sshd by default.
-systemd_services="dhcpcd.service on sshd.service on"
-replaces="base-system<0.77"
+
+# Allow upgrades for compatibility.
+provides="rpi-base-files-${version}_${revision}"
+replaces="rpi-base-files>=0"
+
+# enable ntpd, dhcpcd and sshd by default.
+systemd_services="
+	ntpdate.service on
+	ntpd.service on
+	dhcpcd.service on
+	sshd.service on"
 
 do_install() {
 	# Load the audio module by default.