diff --git a/srcpkgs/virtualbox-ose/files/vboxservice.service b/srcpkgs/virtualbox-ose/files/vboxservice.service
new file mode 100644
index 00000000000..bbd61617d95
--- /dev/null
+++ b/srcpkgs/virtualbox-ose/files/vboxservice.service
@@ -0,0 +1,9 @@
+[Unit]
+Description=VirtualBox Guest Service
+ConditionVirtualization=oracle
+
+[Service]
+ExecStart=/usr/bin/VBoxService -f
+
+[Install]
+WantedBy=multi-user.target
diff --git a/srcpkgs/virtualbox-ose/patches/003-remove_qt_fa_IR.patch b/srcpkgs/virtualbox-ose/patches/003-remove_qt_fa_IR.patch
new file mode 100644
index 00000000000..49707129740
--- /dev/null
+++ b/srcpkgs/virtualbox-ose/patches/003-remove_qt_fa_IR.patch
@@ -0,0 +1,21 @@
+--- a/src/VBox/Frontends/VirtualBox/nls/ApprovedLanguages.kmk   2012-10-18 16:22:52.000000000 +0200
++++ b/src/VBox/Frontends/VirtualBox/nls/ApprovedLanguages.kmk   2012-10-19 03:03:52.640867388 +0200
+@@ -23,7 +23,6 @@
+	de    \
+	en    \
+	es    \
+-	fa_IR \
+	hu    \
+	it    \
+	ja    \
+
+--- a/src/VBox/Frontends/VirtualBox/VBoxUI.pro	2012-10-18 16:22:47.000000000 +0200
++++ b/src/VBox/Frontends/VirtualBox/VBoxUI.pro	2012-10-20 02:48:37.525765901 +0200
+@@ -63,7 +63,6 @@
+	nls/VirtualBox_es.ts \
+	nls/VirtualBox_eu.ts \
+	nls/VirtualBox_fi.ts \
+-	nls/VirtualBox_fa_IR.ts \
+	nls/VirtualBox_fr.ts \
+	nls/VirtualBox_gl_ES.ts \
+	nls/VirtualBox_hu.ts \
diff --git a/srcpkgs/virtualbox-ose/template b/srcpkgs/virtualbox-ose/template
index ded5637cf64..ca99aec01fe 100644
--- a/srcpkgs/virtualbox-ose/template
+++ b/srcpkgs/virtualbox-ose/template
@@ -11,7 +11,7 @@ makedepends="which openssl-devel libcurl-devel libpng-devel>=1.5.10 SDL-devel
  qt-devel libXext-devel libXcursor-devel libXinerama-devel libXrandr-devel
  libXcomposite-devel MesaLib-devel libIDL-devel glib-devel pam-devel python-devel
  pulseaudio-devel libxslt-devel libcap-devel xorg-server-devel libxml2-devel
- docbook-xsl acpica-utils kernel-headers dev86 yasm"
+ glu-devel docbook-xsl acpica-utils kernel-headers dev86 yasm"
 if [ "${XBPS_MACHINE}" = "x86_64" ]; then
 	makedepends="${makedepends} gcc-c++-multilib"
 fi
@@ -32,6 +32,8 @@ do_build() {
 	local _khdrver=$($XBPS_PKGDB_CMD version kernel-headers)
 
 	cp ${FILESDIR}/LocalConfig.kmk .
+	ln -s /bin/echo makeself
+
 	./configure --disable-docs --disable-java --enable-vde \
 		--disable-python --disable-kmods \
 		--nofatal --with-linux=/usr/src/kernel-headers-${_khdrver}
diff --git a/srcpkgs/virtualbox-ose/virtualbox-ose-guest.template b/srcpkgs/virtualbox-ose/virtualbox-ose-guest.template
index bb3c5ca125d..74225cf31fd 100644
--- a/srcpkgs/virtualbox-ose/virtualbox-ose-guest.template
+++ b/srcpkgs/virtualbox-ose/virtualbox-ose-guest.template
@@ -1,5 +1,6 @@
 # Template file for 'virtualbox-ose-guest'.
 #
+systemd_services="vboxservice.service on"
 depends="virtualbox-ose-guest-dkms-${version}_${revision}"
 short_desc="${short_desc} - guest utilities"
 long_desc="${long_desc}
@@ -34,4 +35,5 @@ do_install() {
 	install -Dm755 pam_vbox.so ${DESTDIR}/usr/lib/security/pam_vbox.so
 
 	vinstall ${FILESDIR}/virtualbox-guest.conf 644 usr/lib/modules-load.d
+	vinstall ${FILESDIR}/vboxservice.service 644 usr/lib/systemd/system
 }