--- a/smalltalk	Thu May 17 21:39:37 2018 +0100
+++ b/smalltalk	Tue May 29 22:00:27 2018 +0100
@@ -38,13 +38,13 @@
 DEBUGGER=
 
 if ! test -f "$STX_BIN_DIR/Make.proto"; then
-	# Running in Smalltalk/X jv-branch from and "installation tree"
-    	STX_HOME="$STX_BIN_DIR/.."
-	STX_TOPDIR="$STX_HOME/lib/smalltalkx/$STX_VERSION"
-	STX_LIBDIR="$STX_TOPDIR/lib"
-	STX_PACKAGEDIR="$STX_TOPDIR%/packages"
-	STX_EXE="$STX_TOPDIR/bin/stx-bin"
-	export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$STX_LIBDIR/lib"
+    # Running in Smalltalk/X jv-branch from and "installation tree"
+    STX_HOME="$STX_BIN_DIR/.."
+    STX_TOPDIR="$STX_HOME/lib/smalltalkx/$STX_VERSION"
+    STX_LIBDIR="$STX_TOPDIR/lib"
+    STX_PACKAGEDIR="$STX_TOPDIR%/packages"
+    STX_EXE="$STX_TOPDIR/bin/stx-bin"
+    export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$STX_LIBDIR/lib"
 fi
 
 if [ "$STX_LIBDIR" != "" ]
@@ -312,6 +312,26 @@
 # echo DISPLAY is $DISPLAY
 
 
+#
+# When running on modern DE (such as GNOME or KDE), install 
+# .desktop and .svg so to get nice(r) icon and - more importantly - 
+# proper window grouping in task list. 
+#
+# See issue #66: https://swing.fit.cvut.cz/projects/stx-jv/ticket/66
+#           
+if [ ! -z "$XDG_CURRENT_DESKTOP" ]; then
+    icon_dir=~/.local/share/icons/hicolor/scalable/apps
+    dskp_dir=~/.local/share/applications
+    if [ ! -f "$icon_dir/smalltalkx.svg" ]; then
+        mkdir -p "$icon_dir" || true
+        cp "$STX_BIN_DIR/smalltalkx.svg" "$icon_dir" || true
+    fi
+    if [ ! -f "$dskp_dir/smalltalkx.desktop" ]; then
+        mkdir -p "$dskp_dir" || true
+        cp "$STX_BIN_DIR/smalltalkx.desktop" "$dskp_dir" || true
+    fi
+fi
+
 
 if [ ! -z "$STAPSCRIPT" ]; then
     echo "$STX_TOPDIR/stx/hacking/tapset"