diff --git a/srcpkgs/bumblebee/template b/srcpkgs/bumblebee/template
new file mode 100644
index 00000000000..63bb1c3e8c8
--- /dev/null
+++ b/srcpkgs/bumblebee/template
@@ -0,0 +1,47 @@
+# Template file for 'bumblebee'
+pkgname=bumblebee
+version=3.2.1
+revision=1
+build_style=gnu-configure
+configure_args="CONF_DRIVER_MODULE_NVIDIA=nvidia
+CONF_LDPATH_NVIDIA=/usr/lib
+CONF_MODPATH_NVIDIA=/usr/lib/xorg/modules --sbindir=/usr/bin
+--with-udev-rules=/usr/lib/udev/rules.d/ --without-pidfile"
+makedepends="pkg-config help2man VirtualGL-devel glib-devel MesaLib-devel"
+short_desc="NVIDIA Optimus support for Linux through VirtualGL"
+maintainer="davehome <davehome@redthumb.info.tm>"
+homepage="http://www.bumblebee-project.org/"
+license="GPL-3"
+distfiles="http://www.bumblebee-project.org/${pkgname}-${version}.tar.gz"
+checksum=1018703b07e2f607a4641249d69478ce076ae5a1e9dd6cff5694d394fa7ee30e
+long_desc="
+ The Bumblebee Project is a set of tools developed by people aiming to provide
+ Optimus support under Linux (legacy nVidia hybrid graphics is supported too)
+ while waiting for kernel and drivers to support these notebooks."
+
+post_install() {
+	# ??? Stop nvidia from loading on boot
+	#mkdir -p ${DESTDIR}/usr/lib/modprobe.d
+	#echo "blacklist nvidia" > ${DESTDIR}/usr/lib/modprobe.d/bumblebee.conf
+
+	# Install systemd unit
+	vinstall scripts/systemd/bumblebeed.service 644 \
+		usr/lib/systemd/system
+
+	# Make bash_completion work
+	mv -v ${DESTDIR}/etc/bash_completion.d/bumblebee \
+		${DESTDIR}/etc/bash_completion.d/optirun
+}
+
+
+bumblebee_package() {
+	depends="VirtualGL"
+	systemd_services="bumblebeed.service true"
+	conf_files="/etc/bumblebee/bumblebee.conf
+	/etc/bumblebee/xorg.conf.nouveau
+	/etc/bumblebee/xorg.conf.nvidia"
+	system_groups="bumblebee"
+	pkg_install() {
+		vmove all
+	}
+}