diff --git a/debian/changelog b/debian/changelog
index d41070c0..0cbcd09f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,8 @@ byobu (2.47) unreleased; urgency=low
 
   * usr/lib/byobu/network: fix network script regresssion, LP: #506315
   * usr/lib/byobu/wifi_quality: silence error
+  * byobu.desktop, byobu.svg: install these again, but hide the menu item
+    by default, per pitti's fallback suggestion to LP: #498322
   * Make byobu more portable, LP: #503554
     - debian/rules, debian/manpages, usr/share/man/man1/*: move the manpages
       to make byobu more portable
@@ -9,6 +11,9 @@ byobu (2.47) unreleased; urgency=low
     - debian/install, usr/share/byobu/*: move the share files
     - debian/install, usr/bin/*: move the binary scripts
     - debian/install, usr/share/doc/byobu/*: move the docs
+    - debian/install, etc/*: move the config file
+    - usr/share/applications/byobu.desktop, usr/share/byobu/pixmaps/byobu.svg:
+      moved
 
  -- Dustin Kirkland <kirkland@ubuntu.com>  Mon, 11 Jan 2010 22:54:36 -0600
 
diff --git a/debian/install b/debian/install
index ea8372ae..dc48f374 100644
--- a/debian/install
+++ b/debian/install
@@ -1,10 +1,5 @@
-usr/bin/*
-usr/lib/byobu/*
-usr/share/byobu/*
-usr/share/doc/*
+etc/*
+usr/*
 po/locale/* usr/share/locale
-statusrc etc/byobu
 debian/source_byobu.py usr/share/apport/package-hooks
 debian/lintian/byobu usr/share/lintian/overrides
-#desktop/byobu.svg usr/share/byobu/pixmaps/
-#desktop/byobu.desktop usr/share/applications/
diff --git a/statusrc b/etc/byobu/statusrc
similarity index 100%
rename from statusrc
rename to etc/byobu/statusrc
diff --git a/desktop/byobu.desktop b/usr/share/applications/byobu.desktop
similarity index 81%
rename from desktop/byobu.desktop
rename to usr/share/applications/byobu.desktop
index 88dd295c..caca236f 100644
--- a/desktop/byobu.desktop
+++ b/usr/share/applications/byobu.desktop
@@ -6,4 +6,5 @@ Exec=byobu-launcher
 Type=Application
 Terminal=true
 Encoding=UTF-8
-Categories=Utility;System;
+Categories=GNOME;GTK;Utility;
+NoDisplay=True
diff --git a/desktop/byobu.svg b/usr/share/byobu/pixmaps/byobu.svg
similarity index 100%
rename from desktop/byobu.svg
rename to usr/share/byobu/pixmaps/byobu.svg