diff --git a/gswrap b/gswrap
index 09e4b33..bce8cca 100644
--- a/gswrap
+++ b/gswrap
@@ -203,6 +203,15 @@ then
     else
 	opts[o++]="--unshare-all"
     fi
+    if test -n "${GHOSTVIEW}"
+    then
+	opts[o++]="--die-with-parent"
+	opts[o++]="--setenv GHOSTVIEW ${GHOSTVIEW+"$GHOSTVIEW"}"
+    fi
+    if test -n "${GHOSTVIEW_COLORS}"
+    then
+	opts[o++]="--setenv GHOSTVIEW_COLORS ${GHOSTVIEW+"$GHOSTVIEW_COLORS"}"
+    fi
 else
     opts[o++]="--unshare-all"
 fi
diff --git a/gswrap.changes b/gswrap.changes
index 5a5f648..bae4ed0 100644
--- a/gswrap.changes
+++ b/gswrap.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Wed Oct  7 14:06:36 UTC 2020 - Dr. Werner Fink <werner@suse.de>
+
+- Handle gv and gsview
+
 -------------------------------------------------------------------
 Wed May 20 15:29:06 UTC 2020 - Dr. Werner Fink <werner@suse.de>