Index: avahi-0.6.31/avahi-ui/bssh.desktop.in.in
===================================================================
--- avahi-0.6.31.orig/avahi-ui/bssh.desktop.in.in
+++ avahi-0.6.31/avahi-ui/bssh.desktop.in.in
@@ -6,5 +6,5 @@ Exec=@bindir@/bssh
 Terminal=false
 Type=Application
 Icon=network-wired
-Categories=GNOME;Network;
+Categories=GTK;Network;RemoteAccess;
 StartupNotify=false
Index: avahi-0.6.31/avahi-ui/bvnc.desktop.in.in
===================================================================
--- avahi-0.6.31.orig/avahi-ui/bvnc.desktop.in.in
+++ avahi-0.6.31/avahi-ui/bvnc.desktop.in.in
@@ -6,5 +6,5 @@ Exec=@bindir@/bvnc
 Terminal=false
 Type=Application
 Icon=network-wired
-Categories=GNOME;Network;
+Categories=GTK;Network;RemoteAccess;
 StartupNotify=false
Index: avahi-0.6.31/avahi-python/avahi-discover/avahi-discover.desktop.in.in
===================================================================
--- avahi-0.6.31.orig/avahi-python/avahi-discover/avahi-discover.desktop.in.in
+++ avahi-0.6.31/avahi-python/avahi-discover/avahi-discover.desktop.in.in
@@ -6,5 +6,5 @@ Exec=@bindir@/avahi-discover
 Terminal=false
 Type=Application
 Icon=network-wired
-Categories=GNOME;System;
+Categories=GTK;Network;Monitor;
 StartupNotify=false