diff --git sysutils/consolekit2/Makefile sysutils/consolekit2/Makefile
index 5dcf0f7a437d..bc69718188d0 100644
--- sysutils/consolekit2/Makefile
+++ sysutils/consolekit2/Makefile
@@ -15,8 +15,16 @@ COMMENT=	Framework for defining and tracking users
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-LIB_DEPENDS=	libdbus-1.so:devel/dbus \
-		libpolkit-gobject-1.so:sysutils/polkit
+LIB_DEPENDS=	libdbus-1.so:devel/dbus
+
+OPTIONS_DEFINE=	POLKIT
+OPTIONS_DEFAULT=POLKIT
+OPTIONS_SUB=	yes
+
+POLKIT_DESC=	Build with Polkit support
+
+POLKIT_LIB_DEPENDS=	libpolkit-gobject-1.so:sysutils/polkit
+POLKIT_CONFIGURE_ENABLE=	polkit
 
 WRKSRC=		${WRKDIR}/ConsoleKit2-${PORTVERSION}
 USES=		gettext gmake gnome libtool localbase pathfix pkgconfig \
@@ -30,7 +38,6 @@ CONFIGURE_ARGS=	--with-pid-file=/var/run/${PORTNAME}.pid \
 		--enable-pam-module \
 		--with-pam-module-dir=${PREFIX}/lib \
 		--localstatedir=/var \
-		--enable-polkit \
 		--enable-introspection \
 		--without-html-dir \
 		--disable-udev-acl \
diff --git sysutils/consolekit2/pkg-plist sysutils/consolekit2/pkg-plist
index 110873b5fd6d..af1bd2de3999 100644
--- sysutils/consolekit2/pkg-plist
+++ sysutils/consolekit2/pkg-plist
@@ -46,7 +46,7 @@ share/locale/bg/LC_MESSAGES/ConsoleKit2.mo
 share/locale/es/LC_MESSAGES/ConsoleKit2.mo
 share/locale/es_419/LC_MESSAGES/ConsoleKit2.mo
 share/locale/ru/LC_MESSAGES/ConsoleKit2.mo
-share/polkit-1/actions/org.freedesktop.consolekit.policy
+%%POLKIT%%share/polkit-1/actions/org.freedesktop.consolekit.policy
 @dir etc/ConsoleKit/run-seat.d
 @dir etc/ConsoleKit/run-session.d
 @dir lib/ConsoleKit/run-seat.d