4 files changed, 11 insertions, 4 deletions
diff --git a/source/kde/kde/build/kservice b/source/kde/kde/build/kservice
index 0cfbf0888..00750edc0 100644
--- a/source/kde/kde/build/kservice
+++ b/source/kde/kde/build/kservice
@@ -1 +1 @@
-2
+3
diff --git a/source/kde/kde/post-install/kservice.post-install b/source/kde/kde/post-install/kservice.post-install
index a014f3ba3..8da6bcb67 100644
--- a/source/kde/kde/post-install/kservice.post-install
+++ b/source/kde/kde/post-install/kservice.post-install
@@ -1,4 +1,4 @@
-# Add profile scripts
+# Add profile scripts:
 mkdir -p $PKG/etc/profile.d
 cat $CWD/post-install/kservice/profile.d/kde.sh \
   | sed -e "s#/lib/#/lib${LIBDIRSUFFIX}/#g" \
@@ -7,3 +7,10 @@ cat $CWD/post-install/kservice/profile.d/kde.csh \
   | sed -e "s#/lib/#/lib${LIBDIRSUFFIX}/#g" \
   > $PKG/etc/profile.d/kde.csh
 chmod 0755 $PKG/etc/profile.d/*
+
+# We still have a couple of things looking in the old location,
+# so we'll kludge it with a link (hopefully not forever):
+mkdir -p $PKG/usr/lib${LIBDIRSUFFIX}/libexec/kf5
+if [ ! -e $PKG/usr/lib${LIBDIRSUFFIX}/kf5 ]; then
+  ( cd $PKG/usr/lib${LIBDIRSUFFIX} ; ln -sf libexec/kf5 . )
+fi
diff --git a/source/kde/kde/post-install/kservice/profile.d/kde.csh b/source/kde/kde/post-install/kservice/profile.d/kde.csh
index 59de8963e..a5bc081f6 100644
--- a/source/kde/kde/post-install/kservice/profile.d/kde.csh
+++ b/source/kde/kde/post-install/kservice/profile.d/kde.csh
@@ -6,7 +6,7 @@ endif
 
 # Add KDE paths if they exist:
 if ( -d /usr/lib/kf5 ) then
-    setenv PATH ${PATH}:/usr/lib/kf5
+    setenv PATH ${PATH}:/usr/lib/libexec/kf5
 endif
 if ( -d /usr/lib/kde4/libexec ) then
     setenv PATH ${PATH}:/usr/lib/kde4/libexec
diff --git a/source/kde/kde/post-install/kservice/profile.d/kde.sh b/source/kde/kde/post-install/kservice/profile.d/kde.sh
index 48bf44090..ced4a482b 100644
--- a/source/kde/kde/post-install/kservice/profile.d/kde.sh
+++ b/source/kde/kde/post-install/kservice/profile.d/kde.sh
@@ -5,7 +5,7 @@ export KDEDIRS
 
 # Add KDE paths if they exist:
 if [ -d /usr/lib/kf5 ]; then
-  PATH="$PATH:/usr/lib/kf5"
+  PATH="$PATH:/usr/lib/libexec/kf5"
 fi
 if [ -d /usr/lib/kde4/libexec ]; then
   PATH="$PATH:/usr/lib/kde4/libexec"