diff --git a/debian/changelog b/debian/changelog
index 3a1dbe10..cf7e87ec 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,6 @@
 byobu (5.126) unreleased; urgency=medium
 
+  [ Dustin Kirkland ]
   * usr/lib/byobu/include/constants, usr/share/byobu/keybindings/f-
     keys.screen, usr/share/byobu/keybindings/f-keys.tmux:
     - create a $BYOBU_EDITOR variable, using "sensible-editor" if found
@@ -13,6 +14,13 @@ byobu (5.126) unreleased; urgency=medium
     - BUG: #892489
   * usr/lib/byobu/include/shutil, usr/lib/byobu/logo:
     - add a logo for gLinux
+  * usr/lib/byobu/updates_available,
+    usr/share/byobu/desktop/byobu.desktop:
+
+  [ Didier Roche ]
+  * byobu.desktop:
+    - give some hints for GNOME Shell to correctly match byobu desktop file
+      (LP: #1718482); partial fix, not entirely working yet
 
  -- Dustin Kirkland <kirkland@ubuntu.com>  Fri, 16 Mar 2018 10:09:57 -0700
 
diff --git a/usr/share/byobu/desktop/byobu.desktop b/usr/share/byobu/desktop/byobu.desktop
index 83607e00..02e3798e 100644
--- a/usr/share/byobu/desktop/byobu.desktop
+++ b/usr/share/byobu/desktop/byobu.desktop
@@ -2,7 +2,8 @@
 Name=Byobu Terminal
 Comment=Advanced Command Line and Text Window Manager
 Icon=byobu
-Exec=gnome-terminal --app-id us.kirkland.terminals.byobu -e byobu
+Exec=gnome-terminal --app-id us.kirkland.terminals.byobu --class=us.kirkland.terminals.byobu -e byobu
 Type=Application
 Categories=GNOME;GTK;Utility;
+StartupWMClass=us.kirkland.terminals.byobu
 X-GNOME-Gettext-Domain=byobu