diff --git a/x11/gtk-vnc/Makefile b/x11/gtk-vnc/Makefile
index 6f449260ea9..30132b67858 100644
--- a/x11/gtk-vnc/Makefile
+++ b/x11/gtk-vnc/Makefile
@@ -1,11 +1,11 @@
-# $OpenBSD: Makefile,v 1.5 2008/10/21 21:50:29 landry Exp $
+# $OpenBSD: Makefile,v 1.6 2008/11/21 19:31:54 jasper Exp $
 
 COMMENT-main=		VNC viewer widget for GTK
 COMMENT-plugin=		gtk-vnc browser plugin
 
 V=			0.3.6
 DISTNAME=		gtk-vnc-${V}
-PKGNAME-main=		${DISTNAME}p1
+PKGNAME-main=		${DISTNAME}p2
 PKGNAME-plugin=		gtk-vnc-plugin-${V}p1
 
 SHARED_LIBS +=	gtk-vnc-1.0          0.0      # .0.1
@@ -13,7 +13,7 @@ CATEGORIES=		x11 net
 
 HOMEPAGE=		http://gtk-vnc.sourceforge.net/
 
-# LGPL
+# LGPLv2.1
 PERMIT_PACKAGE_CDROM=	Yes
 PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM= Yes
diff --git a/x11/gtk-vnc/patches/patch-configure b/x11/gtk-vnc/patches/patch-configure
index 96eb75f226d..5b344ca1a03 100644
--- a/x11/gtk-vnc/patches/patch-configure
+++ b/x11/gtk-vnc/patches/patch-configure
@@ -1,6 +1,6 @@
-$OpenBSD: patch-configure,v 1.1 2008/07/13 17:22:13 jasper Exp $
---- configure.orig	Mon May  5 22:54:32 2008
-+++ configure	Mon Jun 30 18:04:43 2008
+$OpenBSD: patch-configure,v 1.2 2008/11/21 19:31:54 jasper Exp $
+--- configure.orig	Tue May  6 04:54:32 2008
++++ configure	Fri Nov 21 20:28:40 2008
 @@ -2384,7 +2384,7 @@ for as_dir in $PATH$PATH_SEPARATOR/opt/sfw/bin
  do
    IFS=$as_save_IFS
@@ -10,3 +10,11 @@ $OpenBSD: patch-configure,v 1.1 2008/07/13 17:22:13 jasper Exp $
  	 for ac_exec_ext in '' $ac_executable_extensions; do
  	   { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; } || continue
  	   case `"$as_dir/$ac_prog$ac_exec_ext" --version 2>&1` in #(
+@@ -9989,7 +9989,6 @@ openbsd*)
+     *)                         need_version=no  ;;
+   esac
+   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
+-  finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
+   shlibpath_var=LD_LIBRARY_PATH
+   if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
+     case $host_os in