3 files changed, 20 insertions, 3 deletions
diff --git a/source/kde/kde/build/kservice b/source/kde/kde/build/kservice
index d00491fd7..0cfbf0888 100644
--- a/source/kde/kde/build/kservice
+++ b/source/kde/kde/build/kservice
@@ -1 +1 @@
-1
+2
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 b0ce563f7..59de8963e 100644
--- a/source/kde/kde/post-install/kservice/profile.d/kde.csh
+++ b/source/kde/kde/post-install/kservice/profile.d/kde.csh
@@ -3,8 +3,16 @@
 if ( ! $?KDEDIRS ) then
     setenv KDEDIRS /usr
 endif
-setenv PATH ${PATH}:/usr/lib/kf5:/usr/lib/kde4/libexec
 
+# Add KDE paths if they exist:
+if ( -d /usr/lib/kf5 ) then
+    setenv PATH ${PATH}:/usr/lib/kf5
+endif
+if ( -d /usr/lib/kde4/libexec ) then
+    setenv PATH ${PATH}:/usr/lib/kde4/libexec
+endif
+
+# Add /etc/kde/xdg to $XDG_CONFIG_DIRS:
 if ( $?XDG_CONFIG_DIRS ) then
     setenv XDG_CONFIG_DIRS ${XDG_CONFIG_DIRS}:/etc/kde/xdg
 else
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 ec317ad1e..48bf44090 100644
--- a/source/kde/kde/post-install/kservice/profile.d/kde.sh
+++ b/source/kde/kde/post-install/kservice/profile.d/kde.sh
@@ -2,8 +2,17 @@
 # KDE additions:
 KDEDIRS=/usr
 export KDEDIRS
-PATH="$PATH:/usr/lib/kf5:/usr/lib/kde4/libexec"
+
+# Add KDE paths if they exist:
+if [ -d /usr/lib/kf5 ]; then
+  PATH="$PATH:/usr/lib/kf5"
+fi
+if [ -d /usr/lib/kde4/libexec ]; then
+  PATH="$PATH:/usr/lib/kde4/libexec"
+fi
 export PATH
+
+# Add /etc/kde/xdg to $XDG_CONFIG_DIRS:
 if [ ! "$XDG_CONFIG_DIRS" = "" ]; then
   XDG_CONFIG_DIRS=$XDG_CONFIG_DIRS:/etc/kde/xdg
 else