diff --git a/plugins/ceph/ceph-osd-info b/plugins/ceph/ceph-osd-info
index 3a21315e..e2240fa8 100755
--- a/plugins/ceph/ceph-osd-info
+++ b/plugins/ceph/ceph-osd-info
@@ -184,5 +184,5 @@ else:
 				print "osd%s_%s.value %s" % (osd,gr,data[osd][graph])
 
 # for Munin Plugin Gallery
-# graph_category ceph
+# graph_category fs
 
diff --git a/plugins/other/irc2 b/plugins/ircd/irc2
similarity index 99%
rename from plugins/other/irc2
rename to plugins/ircd/irc2
index 7c90f54a..4a37c396 100755
--- a/plugins/other/irc2
+++ b/plugins/ircd/irc2
@@ -39,6 +39,7 @@ my $server = $ENV{SERVER} || 'localhost';
 if($ARGV[0] and $ARGV[0] eq "config") {
     print "host_name $server\n";
     print "graph_title ircd status - $server\n";
+    print "graph_category chat\n";
     print "graph_order clients channels servers localclients clientmax localclientmax localservers opers unknownconns\n";
     print "graph_args -l 0\n";
     print "clients.label clients\n";
diff --git a/plugins/other/mumble_users b/plugins/mumble/mumble_users
similarity index 97%
rename from plugins/other/mumble_users
rename to plugins/mumble/mumble_users
index 71ea9e2f..f69edb24 100755
--- a/plugins/other/mumble_users
+++ b/plugins/mumble/mumble_users
@@ -26,6 +26,7 @@ murmur = Murmur.MetaPrx.checkedCast(prx)
 
 if (sys.argv.__len__() == 2) and (sys.argv[1] == "config"):
         print "graph_title Mumble users"
+        print "graph_category voip"
         print "graph_vlabel users"
         print "graph_args --lower-limit 0"
         for server in murmur.getAllServers():
diff --git a/plugins/other/murmur-stats b/plugins/mumble/murmur-stats
similarity index 98%
rename from plugins/other/murmur-stats
rename to plugins/mumble/murmur-stats
index de835f22..bb87951d 100755
--- a/plugins/other/murmur-stats
+++ b/plugins/mumble/murmur-stats
@@ -26,6 +26,7 @@ import Murmur
 if (sys.argv[1:]):
   if (sys.argv[1] == "config"):
     print 'graph_title Murmur (Port %s)' % (serverport)
+    print 'graph_category voip'
     print 'graph_vlabel Count'
     print 'users.label Users'
     print 'uptime.label Uptime in days'
diff --git a/plugins/other/freebsd-upgrades b/plugins/other/freebsd-upgrades
index e9b0b5a5..313c1950 100755
--- a/plugins/other/freebsd-upgrades
+++ b/plugins/other/freebsd-upgrades
@@ -2,6 +2,7 @@
 
 if [ "$1" = "config" ]; then
     echo "graph_title Available Updates"
+    echo "graph_category security"
     echo "graph_args --base 1000 -l 0"
     echo "graph_vlabel upgradeable packages/ports "
     echo "pkg.label binary packages"
diff --git a/plugins/other/passenger_memory b/plugins/other/passenger_memory
index a4237458..b63a361c 100755
--- a/plugins/other/passenger_memory
+++ b/plugins/other/passenger_memory
@@ -12,6 +12,7 @@ memory_stats_command = ENV['memory_stats_command'] || '/opt/ruby-enterprise-1.8.
 
 if ARGV.length > 0 && ARGV[0] == 'config'
   puts "graph_title Passenger Memory Usage"
+  puts "graph_category webserver"
   puts "graph_vlabel MB"
   puts "apache_rss.label Apache Dirty RSS"
   puts "passenger_rss.label Passenger Dirty RSS"
diff --git a/plugins/other/passenger_processes b/plugins/other/passenger_processes
index 9b68a3d0..d8097e96 100755
--- a/plugins/other/passenger_processes
+++ b/plugins/other/passenger_processes
@@ -9,6 +9,7 @@ process_stats_command = ENV['process_stats_command'] || '/opt/ruby-enterprise-1.
 
 if ARGV.length > 0 && ARGV[0] == 'config'
   puts "graph_title Passenger Processes"
+  puts "graph_category webserver"
   puts "graph_vlabel processes"
   puts "max.label Max processes"
   puts "count.label Total processes"
diff --git a/plugins/postgresql/postgres_tuplesratio_ b/plugins/postgresql/postgres_tuplesratio_
index 4826c44b..9568770a 100644
--- a/plugins/postgresql/postgres_tuplesratio_
+++ b/plugins/postgresql/postgres_tuplesratio_
@@ -77,3 +77,7 @@ my $pg = Munin::Plugin::Pgsql->new(
 
 $pg->Process();
 exit(0);
+
+# for Munin Plugin Gallery
+# graph_category db
+
diff --git a/plugins/squid/squid b/plugins/squid/squid
index 59afe4fb..885b9438 100755
--- a/plugins/squid/squid
+++ b/plugins/squid/squid
@@ -460,3 +460,6 @@ foreach my $mgraph (sort keys(%data))
   print "\n";
 }
 
+# for Munin Plugin Gallery
+# graph_category webserver
+
diff --git a/plugins/system/cpu_linux_multi b/plugins/system/cpu_linux_multi
index b8f3dddd..8b882daa 100755
--- a/plugins/system/cpu_linux_multi
+++ b/plugins/system/cpu_linux_multi
@@ -422,3 +422,7 @@ EOF
 	exit(1);
 }
 exit(0);
+
+# for Munin Plugin Gallery
+# graph_category cpu
+