diff --git a/U_mibstore.patch b/U_mibstore.patch
new file mode 100644
index 0000000..f51c4d7
--- /dev/null
+++ b/U_mibstore.patch
@@ -0,0 +1,55 @@
+From 23d87c92b7211cc5249eefe4ab3a2c7f370e279e Mon Sep 17 00:00:00 2001
+From: Zack Rusin <zackr@vmware.com>
+Date: Thu, 14 Feb 2013 22:33:01 +0000
+Subject: Kill mibstore
+
+It was a noop for at least 5 years and it has been removed.
+
+Signed-off-by: Zack Rusin <zackr@vmware.com>
+---
+diff --git a/saa/saa_priv.h b/saa/saa_priv.h
+index 6652054..5d81453 100644
+--- a/saa/saa_priv.h
++++ b/saa/saa_priv.h
+@@ -48,7 +48,6 @@
+ #include "pixmapstr.h"
+ #include "windowstr.h"
+ #include "servermd.h"
+-#include "mibstore.h"
+ #include "colormapst.h"
+ #include "gcstruct.h"
+ #include "input.h"
+diff --git a/src/vmware.c b/src/vmware.c
+index 41201f1..6b74e14 100644
+--- a/src/vmware.c
++++ b/src/vmware.c
+@@ -23,7 +23,6 @@ char rcsId_vmware[] =
+ #include "xf86Pci.h"		/* pci */
+ 
+ #include "mipointer.h"		/* sw cursor */
+-#include "mibstore.h"		/* backing store */
+ #include "micmap.h"		/* mi color map */
+ #include "vgaHW.h"		/* VGA hardware */
+ #include "fb.h"
+@@ -1483,7 +1482,6 @@ VMWAREScreenInit(SCREEN_INIT_ARGS_DECL)
+      * If backing store is to be supported (as is usually the case),
+      * initialise it.
+      */
+-    miInitializeBackingStore(pScreen);
+     xf86SetBackingStore(pScreen);
+     xf86SetSilkenMouse(pScreen);
+ 
+diff --git a/vmwgfx/vmwgfx_driver.c b/vmwgfx/vmwgfx_driver.c
+index 9959ffb..7863ba2 100644
+--- a/vmwgfx/vmwgfx_driver.c
++++ b/vmwgfx/vmwgfx_driver.c
+@@ -1036,7 +1036,6 @@ drv_screen_init(SCREEN_INIT_ARGS_DECL)
+ 		   (ms->only_hw_presents) ? "enabled" : "disabled");
+     }
+ 
+-    miInitializeBackingStore(pScreen);
+     xf86SetBackingStore(pScreen);
+     xf86SetSilkenMouse(pScreen);
+     miDCInitialize(pScreen, xf86GetPointerScreenFuncs());
+--
+cgit v0.9.0.2-2-gbebe
diff --git a/xf86-video-vmware.changes b/xf86-video-vmware.changes
index ac274d7..3911a54 100644
--- a/xf86-video-vmware.changes
+++ b/xf86-video-vmware.changes
@@ -1,3 +1,13 @@
+-------------------------------------------------------------------
+Wed Mar 20 11:28:56 UTC 2013 - sndirsch@suse.com
+
+- make supplements conditional on hardware (bnc#810333)
+
+-------------------------------------------------------------------
+Tue Mar 19 15:37:45 UTC 2013 - hrvoje.senjan@gmail.com
+
+- Add U_mibstore.patch, fixes build with xorg-server 1.14
+
 -------------------------------------------------------------------
 Thu Jan 24 15:37:58 UTC 2013 - sndirsch@suse.com
 
diff --git a/xf86-video-vmware.spec b/xf86-video-vmware.spec
index 357e7f9..9dcee10 100644
--- a/xf86-video-vmware.spec
+++ b/xf86-video-vmware.spec
@@ -25,6 +25,8 @@ Group:          System/X11/Servers/XF86_4
 Url:            http://xorg.freedesktop.org/
 #Source0:       http://xorg.freedesktop.org/releases/individual/driver/%{name}-%{version}.tar.bz2
 Source0:        %{name}-%{version}.tar.bz2
+#PATCH-FIX-UPSTREAM U_mibstore.patch -- removes obsolete include
+Patch0:         U_mibstore.patch
 ExclusiveArch:  %ix86 x86_64
 BuildRequires:  pkg-config
 BuildRequires:  pkgconfig(fontsproto)
@@ -38,7 +40,7 @@ BuildRequires:  pkgconfig(xineramaproto)
 BuildRequires:  pkgconfig(xorg-macros) >= 1.8
 BuildRequires:  pkgconfig(xorg-server) >= 1.0.1
 BuildRequires:  pkgconfig(xproto)
-Supplements:    xorg-x11-server
+Supplements:    modalias(xorg-x11-server:pci:v000015ADd*sv*sd*bc03sc*i*)
 # This was part of the xorg-x11-driver-video package up to version 7.6
 Conflicts:      xorg-x11-driver-video <= 7.6
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
@@ -49,6 +51,7 @@ vmware is an Xorg driver for VMware virtual video cards.
 
 %prep
 %setup -q
+%patch0 -p1
 
 %build
 %configure