diff --git a/x11/Makefile b/x11/Makefile
index 3a53d63aa83..0bd654e8aeb 100644
--- a/x11/Makefile
+++ b/x11/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.465 2011/09/12 07:48:38 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.466 2011/09/12 08:13:31 ajacoutot Exp $
 # $FreeBSD: Makefile,v 1.178 1997/11/24 05:32:52 fenner Exp $
 
      SUBDIR =
@@ -189,7 +189,7 @@
      SUBDIR += piewm
      SUBDIR += pinot
      SUBDIR += podbrowser
-     SUBDIR += polkit-gnome,gtk2
+     SUBDIR += polkit-gnome
      SUBDIR += polkit-qt4
      SUBDIR += pwm
      SUBDIR += py-Xlib
diff --git a/x11/polkit-gnome/Makefile b/x11/polkit-gnome/Makefile
index 49f56811dbe..1a4ef4bd1fb 100644
--- a/x11/polkit-gnome/Makefile
+++ b/x11/polkit-gnome/Makefile
@@ -1,8 +1,9 @@
-# $OpenBSD: Makefile,v 1.11 2011/08/17 16:59:47 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.12 2011/09/12 08:13:31 ajacoutot Exp $
 
 COMMENT=	PolicyKit integration for GNOME/GTK+2
 
 DISTNAME=	polkit-gnome-0.102
+REVISION=	0
 
 CATEGORIES=	x11 sysutils
 
@@ -25,7 +26,7 @@ WANTLIB += Xrandr Xrender atk-1.0 c cairo expat fontconfig freetype
 WANTLIB += gdk_pixbuf-2.0 gio-2.0 glib-2.0 gmodule-2.0 gobject-2.0
 WANTLIB += gthread-2.0 m pango-1.0 pangocairo-1.0 pangoft2-1.0
 WANTLIB += pcre pixman-1 png polkit-agent-1 polkit-gobject-1 pthread
-WANTLIB += pthread-stubs xcb xcb-render xcb-shm z
+WANTLIB += pthread-stubs xcb xcb-render xcb-shm z cairo-gobject gdk-3 gtk-3
 
 MASTER_SITES=	http://hal.freedesktop.org/releases/
 
@@ -34,7 +35,8 @@ MODULES=	devel/gettext \
 
 BUILD_DEPENDS=	devel/gobject-introspection
 
-LIB_DEPENDS=	sysutils/polkit>=0.102
+LIB_DEPENDS=	sysutils/polkit>=0.102 \
+		x11/gtk+3
 
 # XXX: the libtool wrapper script is passed as argument to g-ir-scanner,
 # instead of the actual library
@@ -48,20 +50,8 @@ CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 CONFIGURE_ARGS=	${CONFIGURE_SHARED} \
 		--localstatedir=/var \
 		--enable-introspection \
-		--disable-gtk-doc
-
-FLAVORS=	gtk2
-FLAVOR?=
-
-.if ${FLAVOR:L:Mgtk2}
-CONFIGURE_ARGS+=--with-gtk=2.0
-LIB_DEPENDS+=	x11/gtk+2
-WANTLIB += gdk-x11-2.0 gtk-x11-2.0
-.else
-CONFIGURE_ARGS+=--with-gtk=3.0
-LIB_DEPENDS+=	x11/gtk+3
-WANTLIB += cairo-gobject gdk-3 gtk-3
-.endif
+		--disable-gtk-doc \
+		--with-gtk=3.0
 
 # revert the following commit:
 # ----------------------------------------------------------------------
diff --git a/x11/polkit-gnome/pkg/PLIST b/x11/polkit-gnome/pkg/PLIST
index d1c6e12366a..26c1bace548 100644
--- a/x11/polkit-gnome/pkg/PLIST
+++ b/x11/polkit-gnome/pkg/PLIST
@@ -1,4 +1,5 @@
-@comment $OpenBSD: PLIST,v 1.6 2011/08/17 16:59:47 ajacoutot Exp $
+@comment $OpenBSD: PLIST,v 1.7 2011/09/12 08:13:31 ajacoutot Exp $
+@pkgpath x11/polkit-gnome,gtk2
 %%SHARED%%
 include/polkit-gtk-1/
 include/polkit-gtk-1/polkitgtk/