diff --git a/config/options b/config/options
index d01e02ad60..b35207ce22 100644
--- a/config/options
+++ b/config/options
@@ -67,7 +67,7 @@ fi
 
 get_graphicdrivers() {
   if [ "$GRAPHIC_DRIVERS" = all ]; then
-    GRAPHIC_DRIVERS="i915 i965 r200 r300 r600 radeon nvidia"
+    GRAPHIC_DRIVERS="i915 i965 r200 r300 r600 radeon nvidia vmware"
   fi
 
   for drv in $GRAPHIC_DRIVERS; do
@@ -78,6 +78,7 @@ get_graphicdrivers() {
     [ $drv = r600 ] && MESA_DRIVERS="$MESA_DRIVERS,r600"
     [ $drv = radeon ] && MESA_DRIVERS="$MESA_DRIVERS,radeon"
     [ $drv = nouveau ] && MESA_DRIVERS="$MESA_DRIVERS,nouveau"
+    [ $drv = vmware ] && MESA_DRIVERS="$MESA_DRIVERS,swrast"
 
     if [ $drv = i915 -o $drv = i965 ]; then
       XORG_DRIVERS="$XORG_DRIVERS intel"
@@ -92,12 +93,18 @@ get_graphicdrivers() {
     if [ $drv = nouveau ]; then
       XORG_DRIVERS="$XORG_DRIVERS nouveau"
       DRM_DRIVERS="$DRM_DRIVERS nouveau"
-  fi
+    fi
 
     if [ $drv = nvidia ]; then
       XORG_DRIVERS="$XORG_DRIVERS nvidia"
       XINERAMA_SUPPORT="yes"
     fi
+
+    if [ $drv = vmware ]; then
+      XORG_DRIVERS="$XORG_DRIVERS vmware"
+      DRM_DRIVERS="$DRM_DRIVERS vmware"
+      XINERAMA_SUPPORT="yes"
+    fi
   done
 }
 
diff --git a/packages/x11/driver/xf86-video-vmware/build b/packages/x11/driver/xf86-video-vmware/build
new file mode 100755
index 0000000000..ec6c131233
--- /dev/null
+++ b/packages/x11/driver/xf86-video-vmware/build
@@ -0,0 +1,22 @@
+#!/bin/sh
+
+. config/options $1
+
+xorg_drv_configure_prepend
+
+PKG_CONFIG="$PKG_CONFIG --define-variable=sdkdir=$SYSROOT_PREFIX/usr/include/xorg"
+CFLAGS="$CFLAGS -I$SYSROOT_PREFIX/usr/include/xorg/"
+
+cd $PKG_BUILD
+
+./configure --host=$TARGET_NAME \
+            --build=$HOST_NAME \
+            --prefix=/usr \
+            --sysconfdir=/etc \
+            --enable-shared \
+            --disable-static \
+            --with-xorg-module-dir=$XORG_PATH_MODULES
+
+make
+
+$MAKEINSTALL
diff --git a/packages/x11/driver/xf86-video-vmware/install b/packages/x11/driver/xf86-video-vmware/install
new file mode 100755
index 0000000000..3feff6eb80
--- /dev/null
+++ b/packages/x11/driver/xf86-video-vmware/install
@@ -0,0 +1,6 @@
+#!/bin/sh
+
+. config/options $1
+
+mkdir -p $INSTALL/$XORG_PATH_MODULES/drivers
+  cp -P $PKG_BUILD/src/.libs/vmware_drv.so $INSTALL/$XORG_PATH_MODULES/drivers
diff --git a/packages/x11/driver/xf86-video-vmware/meta b/packages/x11/driver/xf86-video-vmware/meta
new file mode 100644
index 0000000000..be689104e7
--- /dev/null
+++ b/packages/x11/driver/xf86-video-vmware/meta
@@ -0,0 +1,14 @@
+PKG_NAME="xf86-video-vmware"
+PKG_VERSION="11.0.2"
+PKG_REV="1"
+PKG_ARCH="i386 x86_64"
+PKG_LICENSE="OSS"
+PKG_SITE="http://vmware.com/"
+PKG_URL="http://xorg.freedesktop.org/archive/individual/driver/$PKG_NAME-$PKG_VERSION.tar.bz2"
+PKG_DEPENDS="libdrm"
+PKG_BUILD_DEPENDS="toolchain util-macros libdrm libXrandr libXrender libXinerama xorg-server"
+PKG_PRIORITY="optional"
+PKG_SECTION="x11/driver"
+PKG_SHORTDESC="xf86-video-vmware: The Xorg driver for VMware VM machines"
+PKG_LONGDESC="The Xorg driver for VMware VM machines."
+PKG_IS_ADDON="no"
diff --git a/projects/ATV/options b/projects/ATV/options
index 16b553d19e..ed063c7784 100644
--- a/projects/ATV/options
+++ b/projects/ATV/options
@@ -123,7 +123,7 @@
 # Displayserver to use (xorg-server / no)
   DISPLAYSERVER="xorg-server"
 
-# Graphic drivers to use (all / i915,i965,r200,r300,r600,radeon,nvidia,nouveau)
+# Graphic drivers to use (all / i915,i965,r200,r300,r600,radeon,nvidia,nouveau,vmware)
 # Space separated list is supported, 
 # e.g. GRAPHIC_DRIVERS="i915 i965 r300 r600 radeon nvidia nouveau"
   GRAPHIC_DRIVERS="nouveau"
diff --git a/projects/ION/options b/projects/ION/options
index d3d46829ec..94e0b060b8 100644
--- a/projects/ION/options
+++ b/projects/ION/options
@@ -123,9 +123,9 @@
 # Displayserver to use (xorg-server / no)
   DISPLAYSERVER="xorg-server"
 
-# Graphic drivers to use (all / i915,i965,r200,r300,r600,radeon,nvidia,nouveau)
-# Space separated list is supported,
-# e.g. GRAPHIC_DRIVERS="i915 i965 radeon nvidia nouveau"
+# Graphic drivers to use (all / i915,i965,r200,r300,r600,radeon,nvidia,nouveau,vmware)
+# Space separated list is supported, 
+# e.g. GRAPHIC_DRIVERS="i915 i965 r300 r600 radeon nvidia nouveau"
   GRAPHIC_DRIVERS="nvidia"
 
 # libdrm to use (libdrm / libdrm-master)
diff --git a/projects/generic/options b/projects/generic/options
index dbe34334e3..11160dd6ad 100644
--- a/projects/generic/options
+++ b/projects/generic/options
@@ -123,10 +123,10 @@
 # Displayserver to use (xorg-server / no)
   DISPLAYSERVER="xorg-server"
 
-# Graphic drivers to use (all / i915,i965,r200,r300,r600,radeon,nvidia,nouveau)
+# Graphic drivers to use (all / i915,i965,r200,r300,r600,radeon,nvidia,nouveau,vmware)
 # Space separated list is supported, 
 # e.g. GRAPHIC_DRIVERS="i915 i965 r300 r600 radeon nvidia nouveau"
-  GRAPHIC_DRIVERS="i915 i965 r200 r300 r600 radeon nvidia"
+  GRAPHIC_DRIVERS="i915 i965 r200 r300 r600 radeon nvidia vmware"
 
 # libdrm to use (libdrm / libdrm-master)
   LIBDRM="libdrm"
diff --git a/projects/intel/options b/projects/intel/options
index d468c5a483..98f6412268 100644
--- a/projects/intel/options
+++ b/projects/intel/options
@@ -123,9 +123,9 @@
 # Displayserver to use (xorg-server / no)
   DISPLAYSERVER="xorg-server"
 
-# Graphic drivers to use (all / i915,i965,r200,r300,r600,radeon,nvidia,nouveau)
+# Graphic drivers to use (all / i915,i965,r200,r300,r600,radeon,nvidia,nouveau,vmware)
 # Space separated list is supported, 
-# e.g. GRAPHIC_DRIVERS="i915 i965 radeon nvidia nouveau"
+# e.g. GRAPHIC_DRIVERS="i915 i965 r300 r600 radeon nvidia nouveau"
   GRAPHIC_DRIVERS="i965"
 
 # libdrm to use (libdrm / libdrm-master)