diff --git a/plugins/router/snmp__juniper b/plugins/router/snmp__juniper
index 216283ba..da332ea8 100755
--- a/plugins/router/snmp__juniper
+++ b/plugins/router/snmp__juniper
@@ -141,19 +141,19 @@ class JunOSSnmpClient(object):
 		devices = self.get_devices()
 
 		data_def = [
-			('temp', self.hostname, 'System temperature', '--base 1000', 'System temperature in C', 'system'),
-			('cpu', self.hostname, 'CPU usage', '--base 1000 -l 0 --upper-limit 100', 'CPU usage in %', 'system'),
-			('buffer', self.hostname, 'Buffer usage', '--base 1000 -l 0 --upper-limit 100', 'Buffer usage in %', 'system'),
+			('temp', self.hostname, 'System temperature', '--base 1000', 'System temperature in C'),
+			('cpu', self.hostname, 'CPU usage', '--base 1000 -l 0 --upper-limit 100', 'CPU usage in %'),
+			('buffer', self.hostname, 'Buffer usage', '--base 1000 -l 0 --upper-limit 100', 'Buffer usage in %'),
 		]
 
-		for datarow, hostname, title, args, vlabel, category in data_def:
+		for datarow, hostname, title, args, vlabel in data_def:
 			print """multigraph juniper_{datarow}
 host_name {hostname}
 graph_title {title}
 graph_vlabel {vlabel}
 graph_args {args}
-graph_category {category}
-graph_info {title}""".format(datarow=datarow, hostname=hostname, title=title, args=args, vlabel=vlabel, category=category)
+graph_category fw
+graph_info {title}""".format(datarow=datarow, hostname=hostname, title=title, args=args, vlabel=vlabel)
 
 			for suffix, node in devices.iteritems():
 				ident = "%s_%s" % (datarow, node)
@@ -184,7 +184,3 @@ else:
 		c.print_config()
 	else:
 		c.execute()
-
-# for Munin Plugin Gallery
-# graph_category network
-