diff --git a/tools/wineshelllink b/tools/wineshelllink
index 5f4c2de5f07..6ccb2ed5ed0 100755
--- a/tools/wineshelllink
+++ b/tools/wineshelllink
@@ -145,6 +145,10 @@ then
     xpmicon=""
   fi
   mdk_entry >> "$HOME/.menu/wine"
+  if [ -d "/usr/lib/menu" ]
+  then
+    mdk_entry >> "/usr/lib/menu/wine"
+  fi
   update-menus > /dev/null 2>&1
 fi
 
@@ -152,23 +156,41 @@ fi
 
 if [ -d "$HOME/.kde" ]
 then
-  copy_icon "$HOME/.kde/share/applnk/Wine"
-  if [ $mode = "menu" ]
+  kdeversion=0
+  if which kde-config >/dev/null 2>&1
   then
-    kde_entry > "$HOME/.kde/share/applnk/Wine/$link.kdelnk"
+    kdeversion=`kde-config -v | grep KDE: | sed -n "s/^KDE: \([^.]*\)\..*$/\1/p"`
+  fi
 
-    # KDE 1.x kludge.  Wake up KDE, if we can find kpanel running
-    which kwmcom >/dev/null 2>/dev/null && \
-      ps u -C kpanel >/dev/null 2>/dev/null && \
-        kwmcom kpanel:restart
-
-  elif [ -d "$HOME/Desktop" ]
+  if [ $kdeversion = 2 ]
   then
-    kde_entry > "$HOME/Desktop/$link.kdelnk"
-    #   KDE 1.x kludge:  wake up KDE, if we can find kfm running...
-    which kfmclient >/dev/null 2>/dev/null && \
-      ps u -C kfm >/dev/null 2>/dev/null  && \
-        kfmclient refreshDesktop
+    copy_icon "$HOME/.kde/share/applnk/Wine"
+    if [ $mode = "menu" ]
+    then
+      gnome_entry > "$HOME/.kde/share/applnk/Wine/$link.desktop"
+    elif [ -d "$HOME/Desktop" ]
+    then
+      gnome_entry > "$HOME/Desktop/$link.desktop"
+    fi
+  else
+    copy_icon "$HOME/.kde/share/applnk/Wine"
+    if [ $mode = "menu" ]
+    then
+      kde_entry > "$HOME/.kde/share/applnk/Wine/$link.kdelnk"
+
+      # KDE 1.x kludge.  Wake up KDE, if we can find kpanel running
+      which kwmcom >/dev/null 2>/dev/null && \
+        ps u -C kpanel >/dev/null 2>/dev/null && \
+          kwmcom kpanel:restart
+
+    elif [ -d "$HOME/Desktop" ]
+    then
+      kde_entry > "$HOME/Desktop/$link.kdelnk"
+      #   KDE 1.x kludge:  wake up KDE, if we can find kfm running...
+      which kfmclient >/dev/null 2>/dev/null && \
+        ps u -C kfm >/dev/null 2>/dev/null  && \
+          kfmclient refreshDesktop
+    fi
   fi
 fi
 
@@ -182,8 +204,6 @@ then
   then
     gnome_entry > "$HOME/Desktop2/$link.desktop"
   fi
-
-
 fi