diff --git a/app-emulation/vmware-addons/patches/vmware_addons-1.1.0.patch b/app-emulation/vmware-addons/patches/vmware_addons-1.1.0.patch
new file mode 100644
index 000000000..4ec006bd3
--- /dev/null
+++ b/app-emulation/vmware-addons/patches/vmware_addons-1.1.0.patch
@@ -0,0 +1,80 @@
+From 47d5a4f5db7bb6122553320f1b12f7cef7d0ea4b Mon Sep 17 00:00:00 2001
+From: Sergei Reznikov <diver@gelios.net>
+Date: Tue, 11 Nov 2014 13:32:15 +0300
+Subject: [PATCH] Fix makefiles
+
+---
+ vmwaddons/Makefile | 13 ++++++++++---
+ vmwfs/Makefile     |  8 +++++++-
+ vmwmouse/Makefile  |  8 +++++++-
+ 3 files changed, 24 insertions(+), 5 deletions(-)
+
+diff --git a/vmwaddons/Makefile b/vmwaddons/Makefile
+index 3e86bdc..af35f38 100644
+--- a/vmwaddons/Makefile
++++ b/vmwaddons/Makefile
+@@ -58,7 +58,7 @@ RSRCS=
+ #		naming scheme you need to specify the path to the library
+ #		and it's name
+ #		library: my_lib.a entry: my_lib.a or path/my_lib.a
+-LIBS= be stdc++
++LIBS= be $(STDCPPLIBS)
+ 
+ #	specify additional paths to directories following the standard
+ #	libXXX.so or libXXX.a naming scheme. You can specify full paths
+@@ -103,7 +103,7 @@ SYMBOLS = TRUE
+ #	specify debug settings
+ #	if TRUE will allow application to be run from a source-level
+ #	debugger. Note that this will disable all optimzation.
+-DEBUGGER = TRUE
++#DEBUGGER = TRUE
+ 
+ ifeq ($(RELEASE),1)
+ 	OPTIMIZE= FULL
+@@ -131,4 +131,10 @@ APP_VERSION =
+ DRIVER_PATH = 
+ 
+ ## include the makefile-engine
+-include $(BUILDHOME)/etc/makefile-engine
++DEVEL_DIRECTORY := \
++	$(shell if findpaths > /dev/null 2>&1 ; then \
++		findpaths -r "makefile_engine" B_FIND_PATH_DEVELOP_DIRECTORY ; \
++	else \
++		finddir B_SYSTEM_DEVELOP_DIRECTORY ; \
++	fi)
++include $(DEVEL_DIRECTORY)/etc/makefile-engine
+diff --git a/vmwfs/Makefile b/vmwfs/Makefile
+index e8aeff6..fe557c5 100644
+--- a/vmwfs/Makefile
++++ b/vmwfs/Makefile
+@@ -110,4 +110,10 @@ LINKER_FLAGS =
+ INSTALL_DIR = /boot/home/config/add-ons/kernel/file_systems
+ 
+ ## include the makefile-engine
+-include /boot/develop/etc/makefile-engine
++DEVEL_DIRECTORY := \
++	$(shell if findpaths > /dev/null 2>&1 ; then \
++		findpaths -r "makefile_engine" B_FIND_PATH_DEVELOP_DIRECTORY ; \
++	else \
++		finddir B_SYSTEM_DEVELOP_DIRECTORY ; \
++	fi)
++include $(DEVEL_DIRECTORY)/etc/makefile-engine
+diff --git a/vmwmouse/Makefile b/vmwmouse/Makefile
+index 44fabc6..b728d15 100644
+--- a/vmwmouse/Makefile
++++ b/vmwmouse/Makefile
+@@ -132,4 +132,10 @@ APP_VERSION = 1.1.0
+ DRIVER_PATH = 
+ 
+ ## include the makefile-engine
+-include $(BUILDHOME)/etc/makefile-engine
++DEVEL_DIRECTORY := \
++	$(shell if findpaths > /dev/null 2>&1 ; then \
++		findpaths -r "makefile_engine" B_FIND_PATH_DEVELOP_DIRECTORY ; \
++	else \
++		finddir B_SYSTEM_DEVELOP_DIRECTORY ; \
++	fi)
++include $(DEVEL_DIRECTORY)/etc/makefile-engine
+-- 
+1.8.3.4
+
diff --git a/app-emulation/vmware-addons/vmware_addons-1.1.0.recipe b/app-emulation/vmware-addons/vmware_addons-1.1.0.recipe
new file mode 100644
index 000000000..5eb5ca658
--- /dev/null
+++ b/app-emulation/vmware-addons/vmware_addons-1.1.0.recipe
@@ -0,0 +1,70 @@
+SUMMARY="Tools for using Haiku in a VMware virtual machine"
+DESCRIPTION="
+VMware Add-ons are a set of tools to enhance interaction between Haiku, \
+running in a virtual machine, and the host operating system. It is like \
+the official VMware tools on Windows or Linux.
+It currently provides:
+ * Clipboard sharing between Haiku and the host OS
+ * Mouse sharing: the mouse can seamlessly enter and quit the VM window.
+ * Disk compacting: starts the VMware "shrink" process, which reduces the \
+ size of "auto-expanding" virtual disks attached to the virtual machine. \
+ The free space on disks is cleaned up previously, in order to get better \
+ results."
+HOMEPAGE="https://github.com/HaikuArchives/VMwareAddons"
+SRC_URI="git://github.com/HaikuArchives/VMwareAddons#be722875a72213f9dff2d3c491d30e4f87f9b9f4"
+COPYRIGHT="Copyright 2009 Vincent Duvert"
+LICENSE="MIT"
+REVISION="1"
+
+ARCHITECTURES="x86_gcc2 x86 ?x86_64"
+SECONDARY_ARCHITECTURES="x86_gcc2 x86"
+
+PROVIDES="
+	vmwaddons$secondaryArchSuffix = $portVersion
+	cmd:vmwaddons$secondaryArchSuffix = $portVersion
+	cmd:run_backdoor$secondaryArchSuffix = $portVersion
+	"
+REQUIRES="
+	haiku$secondaryArchSuffix >= $haikuVersion
+	"
+
+BUILD_REQUIRES="haiku >= $haikuVersion"
+
+BUILD_PREREQUIRES="
+	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	makefile_engine
+	cmd:gcc$secondaryArchSuffix
+	cmd:make
+	"
+
+PATCHES="vmware_addons-1.1.0.patch"
+
+BUILD()
+{
+	make -C vmwaddons $jobArgs OBJ_DIR=objects
+
+#	vmwmouse seems to be buggy and vmwfs doesn't compile
+#	make -C vmwmouse $jobArgs OBJ_DIR=objects
+#	make -C vmwfs $jobArgs OBJ_DIR=objects
+	cd enhanced_backdoor
+	make
+}
+
+INSTALL()
+{
+	mkdir -p $binDir
+	cp vmwaddons/objects/vmwaddons $binDir
+	
+#	mkdir -p add-ons/input_server/filters
+#	cp vmwmouse/objects/vmwmouse add-ons/input_server/filters
+
+#	mkdir -p add-ons/kernel/file_systems
+#	cp vmwfs/objects/vmwfs add-ons/kernel/file_systems
+
+	cp enhanced_backdoor/run_backdoor $binDir
+
+	# Add a symlink to the Desktop applets directory in Deskbar
+	desktopAppletsDir="$dataDir/deskbar/menu/Desktop applets"
+	mkdir -p "$desktopAppletsDir"
+	ln -s $binDir/vmwaddons "$desktopAppletsDir/VMware Add-ons"
+}