diff --git a/srcpkgs/virtualbox-ose/files/vboxwebsrv/run b/srcpkgs/virtualbox-ose/files/vboxwebsrv/run
new file mode 100755
index 00000000000..782a74735ea
--- /dev/null
+++ b/srcpkgs/virtualbox-ose/files/vboxwebsrv/run
@@ -0,0 +1,3 @@
+#!/bin/sh
+sv check vboxservice >/dev/null || exit 1
+exec vboxwebsrv
diff --git a/srcpkgs/virtualbox-ose/patches/005-gsoap-build.patch b/srcpkgs/virtualbox-ose/patches/005-gsoap-build.patch
new file mode 100644
index 00000000000..d885377bd60
--- /dev/null
+++ b/srcpkgs/virtualbox-ose/patches/005-gsoap-build.patch
@@ -0,0 +1,11 @@
+--- src/VBox/Main/webservice/Makefile.kmk	2013-11-21 19:00:46.812761628 +0100
++++ src/VBox/Main/webservice/Makefile.kmk	2014-01-04 04:37:05.803599026 +0100
+@@ -683,7 +683,7 @@
+ : $(VBOXWEB_GSOAPH_FROM_GSOAP) $(VBOXWEB_GSOAPH_FROM_XSLT) $(VBOX_NSMAP) $(RECOMPILE_ON_MAKEFILE_CURRENT) | $$(dir $$@)
+ 	$(call MSG_GENERATE,,lots of files,$(GSOAPH_RELEVANT))
+ 	$(RM) -f $@
+-	$(REDIRECT) -C $(VBOXWEB_OUT_DIR) -- $(VBOX_SOAPCPP2) $(VBOXWEB_SOAPCPP2_SKIP_FILES) -L -2 -w -I$(VBOX_PATH_GSOAP_IMPORT) $(GSOAPH_RELEVANT)
++	$(REDIRECT) -C $(VBOXWEB_OUT_DIR) -- $(VBOX_SOAPCPP2) $(VBOXWEB_SOAPCPP2_SKIP_FILES) -z1 -L -2 -w -I$(VBOX_PATH_GSOAP_IMPORT) $(GSOAPH_RELEVANT)
+ 	$(APPEND) $@ done
+ 
+ # copy the generated headers and stuff. This has to be a separate rule if we
diff --git a/srcpkgs/virtualbox-ose/template b/srcpkgs/virtualbox-ose/template
index e226e105e3c..40e986ccb0d 100644
--- a/srcpkgs/virtualbox-ose/template
+++ b/srcpkgs/virtualbox-ose/template
@@ -1,7 +1,7 @@
 # Template file for 'virtualbox-ose'
 pkgname=virtualbox-ose
 version=4.3.20
-revision=5
+revision=6
 wrksrc="VirtualBox-${version}"
 short_desc="General-purpose full virtualizer for x86 hardware"
 maintainer="Juan RP <xtraeme@gmail.com>"
@@ -13,12 +13,12 @@ checksum=1484f8e9993ec4fe3892c5165db84d238713d2506e147ed8236541ece642e965
 lib32disabled=yes
 only_for_archs="i686 x86_64"
 
-hostmakedepends="perl pkg-config dev86 yasm acpica-utils"
+hostmakedepends="perl pkg-config dev86 yasm acpica-utils gsoap"
 makedepends="libressl-devel>=2.1.3 libcurl-devel libpng-devel>=1.6 libvpx-devel
  alsa-lib-devel pulseaudio-devel SDL-devel qt-devel libXcursor-devel
  libXinerama-devel libXcomposite-devel libIDL-devel libglib-devel
  pam-devel python-devel libxslt-devel libcap-devel xorg-server-devel>=1.17<1.18
- device-mapper-devel docbook-xsl"
+ device-mapper-devel docbook-xsl gsoap-devel"
 
 if [ "$XBPS_MACHINE" = "x86_64" ]; then
 	makedepends+=" gcc-c++-multilib"
@@ -40,10 +40,12 @@ pre_configure() {
 }
 do_configure() {
 	./configure --disable-docs --disable-java --enable-vde \
-		--disable-python --disable-kmods --nofatal
+		--disable-python --disable-kmods --nofatal --enable-webservice
 }
 do_build() {
 	export USERNAME="$(whoami)"
+	sed -i -e "/webtest_LIBS/,/^webtest_/s/.*LIB_.*/\0 z/" \
+		-e "/vboxwebsrv_LIBS/,/^vboxwebsrv_/s/.*LIB_.*/\0 z/" src/VBox/Main/webservice/Makefile.kmk
 	source ./env.sh
 	kmk ${makejobs} all
 }
@@ -59,10 +61,10 @@ do_install() {
 
 	install -m0755 VBox.sh ${DESTDIR}/usr/bin/VBox
 	for f in VirtualBox VBoxManage VBoxSDL VBoxHeadless \
-		VBoxBalloonCtrl; do
+		VBoxBalloonCtrl vboxwebsrv; do
 		ln -sf VBox ${DESTDIR}/usr/bin/${f}
 	done
-	# comoonents
+	# components
 	install -m0755 components/* -t ${DESTDIR}/usr/lib/virtualbox/components
 
 	# libs
@@ -74,7 +76,7 @@ do_install() {
 		VirtualBox -t ${DESTDIR}/usr/lib/virtualbox
 
 	install -m0755 VBoxManage VBoxSVC VBoxExtPackHelperApp VBoxXPCOMIPCD \
-		VBoxTestOGL VBoxBalloonCtrl \
+		VBoxTestOGL VBoxBalloonCtrl vboxwebsrv webtest \
 		-t ${DESTDIR}/usr/lib/virtualbox
 
 	# locales
@@ -110,6 +112,8 @@ do_install() {
 
 	# Install modules-load.d file.
 	vinstall ${FILESDIR}/virtualbox.conf 644 usr/lib/modules-load.d
+
+	vsv vboxwebsrv
 }
 
 virtualbox-ose-dkms_package() {