diff --git devel/kf5-kauth/Makefile devel/kf5-kauth/Makefile
index 031b68f5e99f..f16c52be1318 100644
--- devel/kf5-kauth/Makefile
+++ devel/kf5-kauth/Makefile
@@ -7,7 +7,12 @@ CATEGORIES=	devel kde kde-frameworks
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	KF5 abstraction to system policy and authentication features
 
-LIB_DEPENDS=	libpolkit-qt5-core-1.so:sysutils/polkit-qt
+OPTIONS_DEFINE=	POLKIT
+#OPTIONS_DEFAULT=POLKIT
+POLKIT_DESC=	Build with Polkit support
+
+POLKIT_LIB_DEPENDS=	libpolkit-qt5-core-1.so:sysutils/polkit-qt
+OPTIONS_SUB=	yes
 
 USES=		cmake compiler:c++11-lib kde:5 qt:5 tar:xz
 USE_KDE=	coreaddons ecm
diff --git devel/kf5-kauth/pkg-plist devel/kf5-kauth/pkg-plist
index 2d081954d64f..99f971c5f109 100644
--- devel/kf5-kauth/pkg-plist
+++ devel/kf5-kauth/pkg-plist
@@ -18,16 +18,16 @@ lib/cmake/KF5Auth/KF5AuthConfigVersion.cmake
 lib/cmake/KF5Auth/KF5AuthMacros.cmake
 lib/cmake/KF5Auth/KF5AuthTargets-%%CMAKE_BUILD_TYPE%%.cmake
 lib/cmake/KF5Auth/KF5AuthTargets.cmake
-lib/cmake/KF5Auth/KF5AuthToolsTargets-%%CMAKE_BUILD_TYPE%%.cmake
-lib/cmake/KF5Auth/KF5AuthToolsTargets.cmake
+%%POLKIT%%lib/cmake/KF5Auth/KF5AuthToolsTargets-%%CMAKE_BUILD_TYPE%%.cmake
+%%POLKIT%%lib/cmake/KF5Auth/KF5AuthToolsTargets.cmake
 lib/libKF5Auth.so
 lib/libKF5Auth.so.5
 lib/libKF5Auth.so.%%KDE_FRAMEWORKS_VERSION%%
 lib/libKF5AuthCore.so
 lib/libKF5AuthCore.so.5
 lib/libKF5AuthCore.so.%%KDE_FRAMEWORKS_VERSION%%
-lib/libexec/kauth/kauth-policy-gen
-%%QT_PLUGINDIR%%/kauth/backend/kauth_backend_plugin.so
+%%POLKIT%%lib/libexec/kauth/kauth-policy-gen
+%%POLKIT%%%%QT_PLUGINDIR%%/kauth/backend/kauth_backend_plugin.so
 %%QT_PLUGINDIR%%/kauth/helper/kauth_helper_plugin.so
 %%QT_MKSPECDIR%%/modules/qt_KAuth.pri
 %%QT_MKSPECDIR%%/modules/qt_KAuthCore.pri
diff --git x11/plasma5-plasma-desktop/Makefile x11/plasma5-plasma-desktop/Makefile
index e65e7e67efd1..d9f97de809ba 100644
--- x11/plasma5-plasma-desktop/Makefile
+++ x11/plasma5-plasma-desktop/Makefile
@@ -39,8 +39,7 @@ USE_KDE=	activities activities-stats archive attica auth baloo \
 		sonnet textwidgets unitconversion wallet \
 		widgetsaddons windowsystem xmlgui
 USE_KDE+=	drkonqi_run infocenter_run kde-cli-tools_run kmenuedit_run \
-		ksysguard_run \
-		polkit-kde-agent-1_run systemsettings_run
+		ksysguard_run systemsettings_run
 USE_QT=		concurrent core dbus declarative gui network phonon4 printsupport \
 		sql svg widgets x11extras xml \
 		buildtools_build qmake_build
diff --git x11/plasma5-plasma-desktop/pkg-plist x11/plasma5-plasma-desktop/pkg-plist
index 2c386d659d77..a1580a0cc40d 100644
--- x11/plasma5-plasma-desktop/pkg-plist
+++ x11/plasma5-plasma-desktop/pkg-plist
@@ -3965,7 +3965,6 @@ share/plasma/shells/org.kde.plasma.desktop/contents/views/Desktop.qml
 share/plasma/shells/org.kde.plasma.desktop/contents/views/Panel.qml
 share/plasma/shells/org.kde.plasma.desktop/metadata.desktop
 share/plasma/shells/org.kde.plasma.desktop/metadata.json
-share/polkit-1/actions/org.kde.kcontrol.kcmclock.policy
 share/qlogging-categories5/kcmkeys.categories
 share/qlogging-categories5/kcmusers.categories
 share/solid/devices/solid-device-Battery.desktop
diff --git x11/plasma5-plasma/Makefile x11/plasma5-plasma/Makefile
index 2beb2b500628..d656acadf5df 100644
--- x11/plasma5-plasma/Makefile
+++ x11/plasma5-plasma/Makefile
@@ -15,7 +15,7 @@ USES=		kde:5 metaport qt:5
 #   * bluedevil as we do have bluez
 #   * plasma-pa don't depend on plamsa-pa by default
 #   * breeze-kde4 don't pull in qt4 bits
-USE_KDE=	${_USE_PLASMA_ALL:Nplasma-pa:Nbreeze-kde4}
+USE_KDE=	${_USE_PLASMA_ALL:Nplasma-pa:Nbreeze-kde4:Npolkit-kde-agent-1}
 
 OPTIONS_DEFINE=	PHONON PULSEAUDIO
 OPTIONS_DEFAULT=	PHONON