diff --git a/tigervnc.spec b/tigervnc.spec
index f34af2b..90bdb09 100644
--- a/tigervnc.spec
+++ b/tigervnc.spec
@@ -1,6 +1,6 @@
 Name:		tigervnc
 Version:	0.0.91
-Release:	0.11%{?dist}.1
+Release:	0.12%{?dist}
 Summary:	A TigerVNC remote display system
 
 Group:		User Interface/Desktops
@@ -39,6 +39,8 @@ Patch0:		tigervnc-102434.patch
 Patch4:		tigervnc-cookie.patch
 Patch8:		tigervnc-viewer-reparent.patch
 Patch9:		tigervnc10-rh495457.patch
+Patch10:	tigervnc10-xorg-rh514528.patch
+Patch11:	tigervnc10-rh508998.patch
 
 %description
 Virtual Network Computing (VNC) is a remote display system which
@@ -86,12 +88,15 @@ to access the desktop on your machine.
 %prep
 %setup -q -n %{name}-%{version}
 
+%patch11 -p1 -b .rh508998
+
 cp -r %{_datadir}/xorg-x11-server-source/* unix/xserver
 pushd unix/xserver
 for all in `find . -type f -perm -001`; do
 	chmod -x "$all"
 done
 patch -p1 -b --suffix .vnc < ../xserver16.patch
+%patch10 -p1 -b .rh514528
 popd
 
 
@@ -244,6 +249,10 @@ fi
 %endif
 
 %changelog
+* Fri Aug 14 2009 Adam Tkac <atkac redhat com> 0.0.91-12
+- don't segfault due unitialized Activate/DeactivateGrab (#514528)
+- fix random cursor disappearing (#508998)
+
 * Tue Jun 23 2009 Adam Tkac <atkac redhat com> 0.0.91-11.1
 - don't ship tigervnc-server-module on s390/s390x
 
diff --git a/tigervnc10-rh508998.patch b/tigervnc10-rh508998.patch
new file mode 100644
index 0000000..7d58ea2
--- /dev/null
+++ b/tigervnc10-rh508998.patch
@@ -0,0 +1,106 @@
+diff -up tigervnc-0.0.91/unix/xserver16.patch.rh508998 tigervnc-0.0.91/unix/xserver16.patch
+--- tigervnc-0.0.91/unix/xserver16.patch.rh508998	2009-08-14 15:26:44.829138415 +0200
++++ tigervnc-0.0.91/unix/xserver16.patch	2009-08-14 15:28:55.017134974 +0200
+@@ -1,13 +1,13 @@
+ diff -up xserver/configure.ac.vnc xserver/configure.ac
+---- xserver/configure.ac.vnc	2009-04-27 14:35:51.116084095 +0200
+-+++ xserver/configure.ac	2009-04-27 14:36:20.012084519 +0200
++--- xserver/configure.ac.vnc	2009-08-14 15:25:23.879137863 +0200
+++++ xserver/configure.ac	2009-08-14 15:25:24.381142987 +0200
+ @@ -29,7 +29,6 @@ AC_PREREQ(2.57)
+- AC_INIT([xorg-server], 1.6.1, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xorg-server)
++ AC_INIT([xorg-server], 1.6.1.901, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xorg-server)
+  AC_CONFIG_SRCDIR([Makefile.am])
+  AM_INIT_AUTOMAKE([dist-bzip2 foreign])
+ -AM_MAINTAINER_MODE
+  
+- RELEASE_DATE="2009-4-14"
++ RELEASE_DATE="2009-5-8"
+  
+ @@ -52,6 +51,7 @@ dnl kdrive-config.h covers the kdrive DD
+  AC_CONFIG_HEADERS(include/kdrive-config.h)
+@@ -17,7 +17,7 @@ diff -up xserver/configure.ac.vnc xserve
+  AM_PROG_AS
+  AC_PROG_INSTALL
+  AC_PROG_LN_S
+-@@ -995,7 +995,7 @@ AC_DEFINE(SHAPE, 1, [Support SHAPE exten
++@@ -994,7 +994,7 @@ AC_DEFINE(SHAPE, 1, [Support SHAPE exten
+  
+  AC_DEFINE(XKB, 1, [Build XKB])
+  AC_DEFINE(XKB_IN_SERVER, 1, [Build XKB server])
+@@ -26,7 +26,7 @@ diff -up xserver/configure.ac.vnc xserve
+  REQUIRED_MODULES="$REQUIRED_MODULES xkbfile"
+  XKB_LIB='$(top_builddir)/xkb/libxkb.la'
+  XKB_STUB_LIB='$(top_builddir)/xkb/libxkbstubs.la'
+-@@ -1199,6 +1199,9 @@ if test "x$XVFB" = xyes; then
++@@ -1207,6 +1207,9 @@ if test "x$XVFB" = xyes; then
+  	AC_SUBST([XVFB_SYS_LIBS])
+  fi
+  
+@@ -36,7 +36,7 @@ diff -up xserver/configure.ac.vnc xserve
+  
+  dnl Xnest DDX
+  
+-@@ -1234,6 +1237,8 @@ xorg_bus_linuxpci=no
++@@ -1242,6 +1245,8 @@ xorg_bus_linuxpci=no
+  xorg_bus_bsdpci=no
+  xorg_bus_sparc=no
+  
+@@ -45,7 +45,7 @@ diff -up xserver/configure.ac.vnc xserve
+  if test "x$XORG" = xyes; then
+  	XORG_DDXINCS='-I$(top_srcdir)/hw/xfree86 -I$(top_srcdir)/hw/xfree86/include -I$(top_srcdir)/hw/xfree86/common'
+  	XORG_OSINCS='-I$(top_srcdir)/hw/xfree86/os-support -I$(top_srcdir)/hw/xfree86/os-support/bus -I$(top_srcdir)/os'
+-@@ -1421,7 +1426,6 @@ if test "x$XORG" = xyes; then
++@@ -1427,7 +1432,6 @@ if test "x$XORG" = xyes; then
+  	AC_DEFINE(XORGSERVER, 1, [Building Xorg server])
+  	AC_DEFINE(XFree86Server, 1, [Building XFree86 server])
+  	AC_DEFINE(XFree86LOADER, 1, [Building loadable XFree86 server])
+@@ -53,7 +53,7 @@ diff -up xserver/configure.ac.vnc xserve
+  	AC_DEFINE(NEED_XF86_TYPES, 1, [Need XFree86 typedefs])
+  	AC_DEFINE(NEED_XF86_PROTOTYPES, 1, [Need XFree86 helper functions])
+  	AC_DEFINE(__XSERVERNAME__, "Xorg", [Name of X server])
+-@@ -1875,6 +1879,7 @@ hw/dmx/input/Makefile
++@@ -1881,6 +1885,7 @@ hw/dmx/input/Makefile
+  hw/dmx/glxProxy/Makefile
+  hw/dmx/Makefile
+  hw/vfb/Makefile
+@@ -62,8 +62,8 @@ diff -up xserver/configure.ac.vnc xserve
+  hw/xwin/Makefile
+  hw/xquartz/Makefile
+ diff -up xserver/hw/Makefile.am.vnc xserver/hw/Makefile.am
+---- xserver/hw/Makefile.am.vnc	2009-04-27 14:35:51.244085095 +0200
+-+++ xserver/hw/Makefile.am	2009-04-27 14:36:07.676108196 +0200
++--- xserver/hw/Makefile.am.vnc	2009-08-14 15:25:23.987137653 +0200
+++++ xserver/hw/Makefile.am	2009-08-14 15:25:24.382139759 +0200
+ @@ -33,7 +33,8 @@ SUBDIRS =			\
+  	$(XNEST_SUBDIRS)	\
+  	$(DMX_SUBDIRS)		\
+@@ -75,8 +75,8 @@ diff -up xserver/hw/Makefile.am.vnc xser
+  DIST_SUBDIRS = dmx xfree86 vfb xnest xwin xquartz kdrive
+  
+ diff -up xserver/mi/miinitext.c.vnc xserver/mi/miinitext.c
+---- xserver/mi/miinitext.c.vnc	2009-04-27 14:35:51.252085110 +0200
+-+++ xserver/mi/miinitext.c	2009-04-27 14:36:07.676108196 +0200
++--- xserver/mi/miinitext.c.vnc	2009-08-14 15:25:23.998137343 +0200
+++++ xserver/mi/miinitext.c	2009-08-14 15:26:19.857206094 +0200
+ @@ -272,6 +272,7 @@ extern void DamageExtensionInit(INITARGS
+  extern void CompositeExtensionInit(INITARGS);
+  #endif
+@@ -85,11 +85,11 @@ diff -up xserver/mi/miinitext.c.vnc xser
+  
+  /* The following is only a small first step towards run-time
+   * configurable extensions.
+-@@ -477,6 +478,7 @@ InitExtensions(int argc, char *argv[])
+- 	GlxPushProvider(&__glXDRISWRastProvider);
+-     if (!noGlxExtension) GlxExtensionInit();
++@@ -438,6 +439,7 @@ InitExtensions(int argc, char *argv[])
++ #ifdef XF86BIGFONT
++     if (!noXFree86BigfontExtension) XFree86BigfontExtensionInit();
+  #endif
+ +    vncExtensionInit();
+- }
+- 
+- #else /* XFree86LOADER */
++ #if !defined(NO_HW_ONLY_EXTS)
++ #if defined(XF86VIDMODE)
++     if (!noXFree86VidModeExtension) XFree86VidModeExtensionInit();
diff --git a/tigervnc10-xorg-rh514528.patch b/tigervnc10-xorg-rh514528.patch
new file mode 100644
index 0000000..93731d2
--- /dev/null
+++ b/tigervnc10-xorg-rh514528.patch
@@ -0,0 +1,13 @@
+diff --git a/dix/devices.c b/dix/devices.c
+index 0858f20..3b8d544 100644
+--- a/dix/devices.c
++++ b/dix/devices.c
+@@ -216,6 +216,8 @@ AddInputDevice(ClientPtr client, DeviceProc deviceProc, Bool autoStart)
+ 
+     /* device grab defaults */
+     dev->deviceGrab.grabTime = currentTime;
++    dev->deviceGrab.ActivateGrab = ActivateKeyboardGrab;
++    dev->deviceGrab.DeactivateGrab = DeactivateKeyboardGrab;
+ 
+     dev->coreEvents = TRUE;
+