diff --git a/x11/x11vnc/system-lib.patch b/x11/x11vnc/system-lib.patch
deleted file mode 100644
index 244e52e12..000000000
--- a/x11/x11vnc/system-lib.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-# --- SDE-COPYRIGHT-NOTE-BEGIN ---
-# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
-#
-# Filename: package/.../x11vnc/system-lib.patch
-# Copyright (C) 2004 - 2006 The T2 SDE Project
-#
-# More information can be found in the files COPYING and README.
-#
-# This patch file is dual-licensed. It is available under the license the
-# patched project is licensed under, as long as it is an OpenSource license
-# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms
-# of the GNU General Public License as published by the Free Software
-# Foundation; either version 2 of the License, or (at your option) any later
-# version.
-# --- SDE-COPYRIGHT-NOTE-END ---
-
-We want to seperate packages: libvncserver and x11vnc to allow users
-a fine grained choice whether they later the later.
-
-The next one removing this patch gets slapped!
-
-  - Rene Rebe <rene@exactcode.de>
-
-diff -ur x11vnc-0.7.2/Makefile.in x11vnc-0.7.2-fixed/Makefile.in
---- x11vnc-0.7.2/Makefile.in	2005-07-13 16:11:02.000000000 +0200
-+++ x11vnc-0.7.2-fixed/Makefile.in	2005-10-05 18:21:54.000000000 +0200
-@@ -180,7 +180,7 @@
- target_alias = @target_alias@
- with_ffmpeg = @with_ffmpeg@
- EXTRA_DIST = tightvnc-1.3dev5-vncviewer-alpha-cursor.patch README.LibVNCServer
--SUBDIRS = libvncserver x11vnc classes
-+SUBDIRS = x11vnc classes
- DIST_SUBDIRS = libvncserver x11vnc classes
- #noinst_HEADERS=rfb.h rfbconfig.h rfbint.h rfbproto.h keysym.h rfbregion.h
- noinst_HEADERS = rfb/rfb.h rfb/rfbconfig.h rfb/rfbint.h rfb/rfbproto.h \
-diff -ur x11vnc-0.7.2/x11vnc/Makefile.in x11vnc-0.7.2-fixed/x11vnc/Makefile.in
---- x11vnc-0.7.2/x11vnc/Makefile.in	2005-07-13 16:11:02.000000000 +0200
-+++ x11vnc-0.7.2-fixed/x11vnc/Makefile.in	2005-10-05 18:25:03.000000000 +0200
-@@ -82,7 +82,7 @@
- @HAVE_X_TRUE@	xkb_bell.$(OBJEXT) xrandr.$(OBJEXT) \
- @HAVE_X_TRUE@	xrecord.$(OBJEXT) xwrappers.$(OBJEXT)
- x11vnc_OBJECTS = $(am_x11vnc_OBJECTS)
--am__DEPENDENCIES_1 = ../libvncserver/libvncserver.a
-+am__DEPENDENCIES_1 = 
- am__DEPENDENCIES_2 =
- @HAVE_X_TRUE@x11vnc_DEPENDENCIES = $(am__DEPENDENCIES_1) \
- @HAVE_X_TRUE@	$(am__DEPENDENCIES_2)
-@@ -217,7 +217,7 @@
- target_alias = @target_alias@
- with_ffmpeg = @with_ffmpeg@
- AM_CFLAGS = -I $(top_srcdir)
--LDADD = ../libvncserver/libvncserver.a @WSOCKLIB@
-+LDADD = -lvncserver @WSOCKLIB@
- SUBDIRS = misc
- DIST_SUBDIRS = misc
- man_MANS = x11vnc.1
diff --git a/x11/x11vnc/x11vnc.conf b/x11/x11vnc/x11vnc.conf
new file mode 100644
index 000000000..00bfbb8ff
--- /dev/null
+++ b/x11/x11vnc/x11vnc.conf
@@ -0,0 +1,16 @@
+# --- SDE-COPYRIGHT-NOTE-BEGIN ---
+# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
+#
+# Filename: package/.../x11vnc/x11vnc.conf
+# Copyright (C) 2010 The OpenSDE Project
+#
+# More information can be found in the files COPYING and README.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; version 2 of the License. A copy of the
+# GNU General Public License can be found in the file COPYING.
+# --- SDE-COPYRIGHT-NOTE-END ---
+
+pkgprefix -t libvncserver
+var_append extraconfopt ' ' "--with-system-libvncserver"
diff --git a/x11/x11vnc/x11vnc.desc b/x11/x11vnc/x11vnc.desc
index b2d205f99..1b4c9cd47 100644
--- a/x11/x11vnc/x11vnc.desc
+++ b/x11/x11vnc/x11vnc.desc
@@ -1,9 +1,8 @@
-
 [COPY] --- SDE-COPYRIGHT-NOTE-BEGIN ---
 [COPY] This copyright note is auto-generated by ./scripts/Create-CopyPatch.
 [COPY]
 [COPY] Filename: package/.../x11vnc/x11vnc.desc
-[COPY] Copyright (C) 2006 - 2007 The OpenSDE Project
+[COPY] Copyright (C) 2006 - 2010 The OpenSDE Project
 [COPY] Copyright (C) 2004 - 2006 The T2 SDE Project
 [COPY]
 [COPY] More information can be found in the files COPYING and README.
@@ -30,8 +29,7 @@
 
 [L] GPL
 [S] Stable
-[V] 0.9.1
+[V] 0.9.10
 [P] X -----5---9 171.900
 
-[D] 3572866500 x11vnc-0.9.1.tar.gz !http://dl.sourceforge.net/sourceforge/libvncserver/x11vnc-0.8.3.tar.gz
-
+[D] 3436455387 x11vnc-0.9.10.tar.gz http://dl.sourceforge.net/project/libvncserver/x11vnc/0.9.10/