diff --git a/x11/Makefile b/x11/Makefile
index 0bd654e8aeb..b42a7f4b746 100644
--- a/x11/Makefile
+++ b/x11/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.466 2011/09/12 08:13:31 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.467 2011/09/12 08:47:23 ajacoutot Exp $
 # $FreeBSD: Makefile,v 1.178 1997/11/24 05:32:52 fenner Exp $
 
      SUBDIR =
@@ -88,7 +88,6 @@
      SUBDIR += gtk-chtheme
      SUBDIR += gtk-engines2
      SUBDIR += gtk-vnc
-     SUBDIR += gtk-vnc,gtk2
      SUBDIR += gtk2-aurora-engine
      SUBDIR += gtk2-equinox-engine
      SUBDIR += gtk2-murrine-engine
diff --git a/x11/gtk-vnc/Makefile b/x11/gtk-vnc/Makefile
index c967d71c9e4..ba82f0174e4 100644
--- a/x11/gtk-vnc/Makefile
+++ b/x11/gtk-vnc/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.30 2011/07/15 07:06:06 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.31 2011/09/12 08:47:23 ajacoutot Exp $
 
 COMMENT=		VNC viewer widget for GTK
 
@@ -7,8 +7,9 @@ GNOME_VERSION=		0.4.3
 
 PKGNAME=		${DISTNAME}
 
-REVISION=		3
+REVISION=		4
 
+SHARED_LIBS +=  gtk-vnc-2.0               0.0 # 0.2
 SHARED_LIBS +=  gvnc-1.0             0.0 # 0.1
 
 CATEGORIES=		x11 net
@@ -27,7 +28,8 @@ WANTLIB += drm expat fontconfig freetype gcrypt gdk_pixbuf-2.0
 WANTLIB += gio-2.0 glib-2.0 gmodule-2.0 gmp gnutls gobject-2.0
 WANTLIB += gpg-error gthread-2.0 hogweed m nettle pango-1.0 pangocairo-1.0
 WANTLIB += pangoft2-1.0 pcre pixman-1 png pthread pthread-stubs
-WANTLIB += sasl2 tasn1 xcb xcb-render xcb-shm z
+WANTLIB += sasl2 tasn1 xcb xcb-render xcb-shm z p11-kit
+WANTLIB += cairo-gobject gdk-3 gtk-3
 
 MODULES=		devel/gettext \
 			x11/gnome
@@ -37,14 +39,16 @@ BUILD_DEPENDS=		${RUN_DEPENDS} \
 
 LIB_DEPENDS=		security/gnutls \
 			security/cyrus-sasl2 \
-			security/libgcrypt
+			security/libgcrypt \
+			x11/gtk+3
 
 CONFIGURE_STYLE=	gnu
 CONFIGURE_ARGS=		${CONFIGURE_SHARED} \
 			--enable-introspection \
 			--without-examples \
 			--with-sasl \
-			--without-libview
+			--without-libview \
+			--with-gtk=3.0
 
 # mozilla plugin and python bindings are gtk+2 only
 CONFIGURE_ARGS +=	--disable-plugin \
@@ -53,19 +57,4 @@ CONFIGURE_ARGS +=	--disable-plugin \
 CONFIGURE_ENV=		CPPFLAGS="-I${LOCALBASE}/include" \
 			LDFLAGS="-L${LOCALBASE}/lib"
 
-FLAVORS=	gtk2
-FLAVOR?=
-
-.if ${FLAVOR:L:Mgtk2}
-SHARED_LIBS +=	gtk-vnc-1.0               2.0 # 0.1
-CONFIGURE_ARGS +=	--with-gtk=2.0
-LIB_DEPENDS +=		x11/gtk+2
-WANTLIB +=		gdk-x11-2.0 gtk-x11-2.0
-.else
-SHARED_LIBS +=  gtk-vnc-2.0               0.0 # 0.2
-CONFIGURE_ARGS +=	--with-gtk=3.0
-LIB_DEPENDS +=		x11/gtk+3
-WANTLIB += cairo-gobject gdk-3 gtk-3
-.endif
-
 .include <bsd.port.mk>
diff --git a/x11/gtk-vnc/pkg/PFRAG.gtk2 b/x11/gtk-vnc/pkg/PFRAG.gtk2
deleted file mode 100644
index bdb2007d3e4..00000000000
--- a/x11/gtk-vnc/pkg/PFRAG.gtk2
+++ /dev/null
@@ -1,11 +0,0 @@
-@comment $OpenBSD: PFRAG.gtk2,v 1.1 2011/07/15 07:06:06 ajacoutot Exp $
-include/gtk-vnc-1.0/
-include/gtk-vnc-1.0/vncdisplay.h
-include/gtk-vnc-1.0/vncdisplayenums.h
-include/gtk-vnc-1.0/vncgrabsequence.h
-include/gtk-vnc-1.0/vncimageframebuffer.h
-lib/girepository-1.0/GtkVnc-1.0.typelib
-lib/libgtk-vnc-1.0.a
-lib/libgtk-vnc-1.0.la
-lib/pkgconfig/gtk-vnc-1.0.pc
-share/gir-1.0/GtkVnc-1.0.gir
diff --git a/x11/gtk-vnc/pkg/PFRAG.gtk2-shared b/x11/gtk-vnc/pkg/PFRAG.gtk2-shared
deleted file mode 100644
index d5b806412bc..00000000000
--- a/x11/gtk-vnc/pkg/PFRAG.gtk2-shared
+++ /dev/null
@@ -1,2 +0,0 @@
-@comment $OpenBSD: PFRAG.gtk2-shared,v 1.1 2011/07/15 07:06:06 ajacoutot Exp $
-@lib lib/libgtk-vnc-1.0.so.${LIBgtk-vnc-1.0_VERSION}
diff --git a/x11/gtk-vnc/pkg/PFRAG.no-gtk2 b/x11/gtk-vnc/pkg/PFRAG.no-gtk2
deleted file mode 100644
index c35909743dc..00000000000
--- a/x11/gtk-vnc/pkg/PFRAG.no-gtk2
+++ /dev/null
@@ -1,11 +0,0 @@
-@comment $OpenBSD: PFRAG.no-gtk2,v 1.1 2011/07/15 07:06:06 ajacoutot Exp $
-include/gtk-vnc-2.0/
-include/gtk-vnc-2.0/vncdisplay.h
-include/gtk-vnc-2.0/vncdisplayenums.h
-include/gtk-vnc-2.0/vncgrabsequence.h
-include/gtk-vnc-2.0/vncimageframebuffer.h
-lib/girepository-1.0/GtkVnc-2.0.typelib
-lib/libgtk-vnc-2.0.a
-lib/libgtk-vnc-2.0.la
-lib/pkgconfig/gtk-vnc-2.0.pc
-share/gir-1.0/GtkVnc-2.0.gir
diff --git a/x11/gtk-vnc/pkg/PFRAG.no-gtk2-shared b/x11/gtk-vnc/pkg/PFRAG.no-gtk2-shared
deleted file mode 100644
index 99f5122a61b..00000000000
--- a/x11/gtk-vnc/pkg/PFRAG.no-gtk2-shared
+++ /dev/null
@@ -1,2 +0,0 @@
-@comment $OpenBSD: PFRAG.no-gtk2-shared,v 1.1 2011/07/15 07:06:06 ajacoutot Exp $
-@lib lib/libgtk-vnc-2.0.so.${LIBgtk-vnc-2.0_VERSION}
diff --git a/x11/gtk-vnc/pkg/PFRAG.shared b/x11/gtk-vnc/pkg/PFRAG.shared
index 8e249e5e628..684bedef94e 100644
--- a/x11/gtk-vnc/pkg/PFRAG.shared
+++ b/x11/gtk-vnc/pkg/PFRAG.shared
@@ -1,3 +1,2 @@
-@comment $OpenBSD: PFRAG.shared,v 1.3 2011/07/15 07:06:06 ajacoutot Exp $
-%%gtk2%%
-!%%gtk2%%
+@comment $OpenBSD: PFRAG.shared,v 1.4 2011/09/12 08:47:23 ajacoutot Exp $
+@lib lib/libgtk-vnc-2.0.so.${LIBgtk-vnc-2.0_VERSION}
diff --git a/x11/gtk-vnc/pkg/PLIST b/x11/gtk-vnc/pkg/PLIST
index 1cc2726125d..ae7d5164f2b 100644
--- a/x11/gtk-vnc/pkg/PLIST
+++ b/x11/gtk-vnc/pkg/PLIST
@@ -1,8 +1,14 @@
-@comment $OpenBSD: PLIST,v 1.3 2011/07/15 07:06:06 ajacoutot Exp $
+@comment $OpenBSD: PLIST,v 1.4 2011/09/12 08:47:23 ajacoutot Exp $
 @pkgpath ${BASE_PKGPATH}
 @pkgpath ${BASE_PKGPATH},-main
+@pkgpath x11/gtk-vnc,gtk2
 %%SHARED%%
 @bin bin/gvnccapture
+include/gtk-vnc-2.0/
+include/gtk-vnc-2.0/vncdisplay.h
+include/gtk-vnc-2.0/vncdisplayenums.h
+include/gtk-vnc-2.0/vncgrabsequence.h
+include/gtk-vnc-2.0/vncimageframebuffer.h
 include/gvnc-1.0/
 include/gvnc-1.0/vncbaseframebuffer.h
 include/gvnc-1.0/vnccolormap.h
@@ -14,14 +20,19 @@ include/gvnc-1.0/vncpixelformat.h
 include/gvnc-1.0/vncutil.h
 lib/girepository-1.0/
 lib/girepository-1.0/GVnc-1.0.typelib
+lib/girepository-1.0/GtkVnc-2.0.typelib
+lib/libgtk-vnc-2.0.a
+lib/libgtk-vnc-2.0.la
 lib/libgvnc-1.0.a
 lib/libgvnc-1.0.la
 @lib lib/libgvnc-1.0.so.${LIBgvnc-1.0_VERSION}
 lib/pkgconfig/
+lib/pkgconfig/gtk-vnc-2.0.pc
 lib/pkgconfig/gvnc-1.0.pc
 @man man/man1/gvnccapture.1
 share/gir-1.0/
 share/gir-1.0/GVnc-1.0.gir
+share/gir-1.0/GtkVnc-2.0.gir
 share/locale/ca/LC_MESSAGES/gtk-vnc.mo
 share/locale/ca@valencia/
 share/locale/ca@valencia/LC_MESSAGES/
@@ -60,5 +71,3 @@ share/locale/th/LC_MESSAGES/gtk-vnc.mo
 share/locale/zh_CN/LC_MESSAGES/gtk-vnc.mo
 share/locale/zh_HK/LC_MESSAGES/gtk-vnc.mo
 share/locale/zh_TW/LC_MESSAGES/gtk-vnc.mo
-%%gtk2%%
-!%%gtk2%%