diff --git a/kde-base/kdepim-common-libs/kdepim-common-libs-4.14.5.ebuild b/kde-base/kdepim-common-libs/kdepim-common-libs-4.14.5.ebuild
index 0492008..23d42b5 100644
--- a/kde-base/kdepim-common-libs/kdepim-common-libs-4.14.5.ebuild
+++ b/kde-base/kdepim-common-libs/kdepim-common-libs-4.14.5.ebuild
@@ -31,6 +31,7 @@ RDEPEND="${DEPEND}
 	!=kde-base/kmail-4.12.0
 	!=kde-base/kmail-4.12.1
 	!<kde-base/kmail-4.13.60
+	!<kde-base/kmail-4.14.5
 	!<kde-base/korganizer-4.5.67:4
 	app-crypt/gnupg
 	$(add_kdebase_dep kdepim-runtime)
@@ -58,6 +59,8 @@ KMEXTRA="
 	messagecore/
 	messagelist/
 	messageviewer/
+	mailcommon/
+	mailimporter/
 	noteshared/
 	pimcommon/
 	templateparser/
@@ -67,8 +70,9 @@ KMEXTRACTONLY="
 	kmail/
 	knode/org.kde.knode.xml
 	korgac/org.kde.korganizer.KOrgac.xml
+	korganizer/org.kde.Korganizer.Calendar.xml
 	korganizer/org.kde.korganizer.Korganizer.xml
-	mailcommon/
+	agents/mailfilteragent/org.freedesktop.Akonadi.MailFilterAgent.xml
 "
 KMSAVELIBS="true"
 
diff --git a/kde-base/kmail/kmail-4.14.5.ebuild b/kde-base/kmail/kmail-4.14.5.ebuild
index 628a010..e4b5cf1 100644
--- a/kde-base/kmail/kmail-4.14.5.ebuild
+++ b/kde-base/kmail/kmail-4.14.5.ebuild
@@ -31,7 +31,6 @@ KMEXTRACTONLY="
 	agents/folderarchiveagent.desktop
 	agents/sendlateragent/
 	akonadi_next/
-	calendarsupport/
 	calendarviews/
 	grantleeeditor/grantleethemeeditor/
 	korganizer/
@@ -48,6 +47,8 @@ KMCOMPILEONLY="
 	messagecore/
 	messagelist/
 	messageviewer/
+	mailcommon/
+	mailimporter/
 	pimcommon/
 	templateparser/
 	incidenceeditor-ng/
@@ -63,8 +64,6 @@ KMEXTRA="
 	ksendemail/
 	importwizard/
 	libksieve/
-	mailcommon/
-	mailimporter/
 	mboximporter/
 	pimsettingexporter/
 	plugins/messageviewer/
diff --git a/kde-base/korganizer/korganizer-4.14.5.ebuild b/kde-base/korganizer/korganizer-4.14.5.ebuild
index 22f45dd..da8319c 100644
--- a/kde-base/korganizer/korganizer-4.14.5.ebuild
+++ b/kde-base/korganizer/korganizer-4.14.5.ebuild
@@ -30,19 +30,29 @@ KMLOADLIBS="kdepim-common-libs"
 KMEXTRA="
 	korgac/
 "
-
 KMEXTRACTONLY="
+	agents/sendlateragent/
 	akonadi_next/
 	calendarviews/
 	kdgantt2/
 	kmail/
-	pimcommon/
 	knode/org.kde.knode.xml
 	libkdepimdbusinterfaces/
-	korgac/org.kde.korganizer.KOrgac.xml
+	libkleo/
+	libkpgp/
+	agents/mailfilteragent/org.freedesktop.Akonadi.MailFilterAgent.xml
 "
-
 KMCOMPILEONLY="
+	grantleetheme/
+	kaddressbookgrantlee/
+	messagecomposer/
+	messagecore/
+	messagelist/
+	messageviewer/
+	mailcommon/
+	mailimporter/
+	pimcommon/
+	templateparser/
 	incidenceeditor-ng/
 	calendarsupport/
 "