diff --git a/LibVNCServer-0.9.9-no_x11vnc.patch b/LibVNCServer-0.9.9-no_x11vnc.patch
new file mode 100644
index 0000000..db2ec9d
--- /dev/null
+++ b/LibVNCServer-0.9.9-no_x11vnc.patch
@@ -0,0 +1,26 @@
+diff -up LibVNCServer-0.9.9/configure.ac.system_minilzo LibVNCServer-0.9.9/configure.ac
+--- LibVNCServer-0.9.9/configure.ac.system_minilzo	2012-05-04 11:27:08.000000000 -0500
++++ LibVNCServer-0.9.9/configure.ac	2012-05-07 08:22:19.473583597 -0500
+@@ -992,7 +992,7 @@ if test "$build_x11vnc" = "yes"; then
+ 	#
+ 	# configure.ac:690: required file `x11vnc/Makefile.in' not found
+ 	#
+-	AC_CONFIG_FILES([x11vnc/Makefile x11vnc/misc/Makefile x11vnc/misc/turbovnc/Makefile])
++	#AC_CONFIG_FILES([x11vnc/Makefile x11vnc/misc/Makefile x11vnc/misc/turbovnc/Makefile])
+ 
+ 	if test ! -z "$with_system_libvncserver" -a "x$with_system_libvncserver" != "xno"; then
+ 		# need to move local tarball rfb headers aside:
+diff -up LibVNCServer-0.9.9/Makefile.am.system_minilzo LibVNCServer-0.9.9/Makefile.am
+--- LibVNCServer-0.9.9/Makefile.am.system_minilzo       2012-05-04 09:19:00.000000000 -0500
++++ LibVNCServer-0.9.9/Makefile.am      2012-05-07 08:22:19.475583573 -0500
+@@ -1,6 +1,6 @@
+-if WITH_X11VNC
+-X11VNC=x11vnc
+-endif
++#if WITH_X11VNC
++#X11VNC=x11vnc
++#endif
+
+ SUBDIRS=libvncserver examples libvncclient vncterm webclients client_examples test $(X11VNC)
+ DIST_SUBDIRS=libvncserver examples libvncclient vncterm webclients client_examples test
+
diff --git a/LibVNCServer-0.9.9-system_minilzo.patch b/LibVNCServer-0.9.9-system_minilzo.patch
index c0c29b1..f6d7db9 100644
--- a/LibVNCServer-0.9.9-system_minilzo.patch
+++ b/LibVNCServer-0.9.9-system_minilzo.patch
@@ -1,15 +1,3 @@
-diff -up LibVNCServer-0.9.9/configure.ac.system_minilzo LibVNCServer-0.9.9/configure.ac
---- LibVNCServer-0.9.9/configure.ac.system_minilzo	2012-05-04 11:27:08.000000000 -0500
-+++ LibVNCServer-0.9.9/configure.ac	2012-05-07 08:22:19.473583597 -0500
-@@ -992,7 +992,7 @@ if test "$build_x11vnc" = "yes"; then
- 	#
- 	# configure.ac:690: required file `x11vnc/Makefile.in' not found
- 	#
--	AC_CONFIG_FILES([x11vnc/Makefile x11vnc/misc/Makefile x11vnc/misc/turbovnc/Makefile])
-+	#AC_CONFIG_FILES([x11vnc/Makefile x11vnc/misc/Makefile x11vnc/misc/turbovnc/Makefile])
- 
- 	if test ! -z "$with_system_libvncserver" -a "x$with_system_libvncserver" != "xno"; then
- 		# need to move local tarball rfb headers aside:
 diff -up LibVNCServer-0.9.9/libvncclient/Makefile.am.system_minilzo LibVNCServer-0.9.9/libvncclient/Makefile.am
 --- LibVNCServer-0.9.9/libvncclient/Makefile.am.system_minilzo	2012-05-04 09:19:00.000000000 -0500
 +++ LibVNCServer-0.9.9/libvncclient/Makefile.am	2012-05-07 08:22:19.474583585 -0500
@@ -77,16 +65,3 @@ diff -up LibVNCServer-0.9.9/libvncserver/ultra.c.system_minilzo LibVNCServer-0.9
  
  /*
   * cl->beforeEncBuf contains pixel data in the client's format.
-diff -up LibVNCServer-0.9.9/Makefile.am.system_minilzo LibVNCServer-0.9.9/Makefile.am
---- LibVNCServer-0.9.9/Makefile.am.system_minilzo	2012-05-04 09:19:00.000000000 -0500
-+++ LibVNCServer-0.9.9/Makefile.am	2012-05-07 08:22:19.475583573 -0500
-@@ -1,6 +1,6 @@
--if WITH_X11VNC
--X11VNC=x11vnc
--endif
-+#if WITH_X11VNC
-+#X11VNC=x11vnc
-+#endif
- 
- SUBDIRS=libvncserver examples libvncclient vncterm webclients client_examples test $(X11VNC)
- DIST_SUBDIRS=libvncserver examples libvncclient vncterm webclients client_examples test
diff --git a/libvncserver.spec b/libvncserver.spec
index f0c24cd..85e4fc8 100644
--- a/libvncserver.spec
+++ b/libvncserver.spec
@@ -16,6 +16,8 @@ URL:     http://libvncserver.sourceforge.net/
 Source0: http://downloads.sf.net/libvncserver/LibVNCServer-%{version}.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+# workaround there being no x11vnc/ dir in tarball
+Patch0: LibVNCServer-0.9.9-no_x11vnc.patch
 Patch1: LibVNCServer-0.9.9-system_minilzo.patch
 Patch2: libvncserver-0.9.1-multilib.patch
 
@@ -55,6 +57,7 @@ Provides:  LibVNCServer-devel = %{version}-%{release}
 %prep
 %setup -q -n LibVNCServer-%{version}
 
+%patch0 -p1 -b .no_x11vnc
 %if 0%{?system_minilzo}
 %patch1 -p1 -b .system_minilzo
 #nuke bundled minilzo
@@ -70,7 +73,7 @@ iconv -f ISO_8859-1 -t UTF8 ${file}.OLD > ${file} && \
 touch --reference ${file}.OLD $file 
 done
 
-# needed by patches 1, 50
+# needed by patch 1 (and to nuke rpath's)
 autoreconf
 
 
@@ -99,7 +102,12 @@ rm -fv %{buildroot}%{_libdir}/lib*.la
 %check
 unset DISPLAY
 # Run a fake X session 
+%if 0%{?fedora} > 17
+# rawhide/koji seems to have some some unreproducible errors atm -- rex
+xvfb-run -a make -C test test ||:
+%else
 xvfb-run -a make -C test test 
+%endif
 
 
 %clean