diff --git a/plugins/other/zfs-filesystem-graph b/plugins/other/zfs-filesystem-graph
index f8bc96a1..b3f8bd84 100755
--- a/plugins/other/zfs-filesystem-graph
+++ b/plugins/other/zfs-filesystem-graph
@@ -3,6 +3,7 @@
 # Plugin to monitor a ZFS Filesystem
 #
 # Wildcard-plugin to monitor a zfs filesystems. 
+#
 # To monitor a filesystem, link zfs_fs_<zpool>_<filesystem> to this file. E.g.
 #
 #    ln -s /usr/share/munin/node/plugins-auto/zfs_fs_ /etc/munin/node.d/zfs_fs_tank_foo
@@ -15,12 +16,10 @@
 #
 # 	config   (required)
 # 	autoconf (optional - used by munin-config)
+# 
+# ** WARNING **
+# For now this plugin does not allow "_" in the name of a zpool or filesystems
 #
-# Magic markers - optional - used by installation scripts and
-# munin-config:
-#
-#%# family=auto
-#%# capabilities=autoconf
 
 myname=`basename $0 | sed 's/^zfs_fs_//g' | sed -e 's/_/\//g'`
 
@@ -38,49 +37,51 @@ values=( $(zfs get -p usedbydataset,usedbychildren,usedbysnapshots,usedbyrefrese
 
 if [ "$1" = "config" ]; then
 
-	echo "graph_title zfs $myname"
-	echo 'graph_order usedbydataset usedbychildren usedbysnapshots usedbyrefreservation available total quota'
-	echo "graph_args --base 1024 -r -l 0 --vertical-label Bytes --upper-limit ${values[6]}"
-	echo 'graph_info This graph shows how is used a zfs filesystems.'
-	echo 'graph_category Zfs'
-	echo 'graph_period second'
-	echo 'usedbydataset.label UsedByDataset'
-	echo 'usedbydataset.draw AREA'
-	echo 'usedbydataset.info Used space by Dataset'
-	echo 'usedbydataset.colour FF0000'
-	echo 'usedbychildren.label UsedByChildren'
-	echo 'usedbychildren.draw STACK'
-	echo 'usedbychildren.info Used space by children'
-	echo 'usedbychildren.colour FFCC33'
-	echo 'usedbysnapshots.label UsedBySnapshots'
-	echo 'usedbysnapshots.draw STACK'
-	echo 'usedbysnapshots.info Used space by snapshot'
-	echo 'usedbysnapshots.colour 0000FF'
-	echo 'usedbyrefreservation.label Usedbyrefreservation'
-	echo 'usedbyrefreservation.draw STACK'
-	echo 'usedbyrefreservation.info Used space by Ref Reservation'
-	echo 'usedbyrefreservation.colour 33CCFF'
-	echo 'available.label Available'
-	echo 'available.draw STACK'
-	echo 'available.info Free space'
-	echo 'available.colour 00FF00'
-	echo 'total.label Total'
-	echo 'total.draw LINE1'
-	echo 'total.info Total'
-	echo 'total.colour 000000'
-	echo 'quota.label Quota'
-	echo 'quota.draw LINE1'
-	echo 'quota.info Quota'
-	echo 'quota.colour 555555'
+	echo <<EOF "graph_title zfs $myname
+graph_order usedbydataset usedbychildren usedbysnapshots usedbyrefreservation available total quota
+graph_args --base 1024 -r -l 0 --vertical-label Bytes --upper-limit ${values[6]}
+graph_info This graph shows how is used a zfs filesystems.
+graph_category Zfs
+graph_period second
+usedbydataset.label UsedByDataset
+usedbydataset.draw AREA
+usedbydataset.info Used space by Dataset
+usedbydataset.colour FF0000
+usedbychildren.label UsedByChildren
+usedbychildren.draw STACK
+usedbychildren.info Used space by children
+usedbychildren.colour FFCC33
+usedbysnapshots.label UsedBySnapshots
+usedbysnapshots.draw STACK
+usedbysnapshots.info Used space by snapshot
+usedbysnapshots.colour 0000FF
+usedbyrefreservation.label Usedbyrefreservation
+usedbyrefreservation.draw STACK
+usedbyrefreservation.info Used space by Ref Reservation
+usedbyrefreservation.colour 33CCFF
+available.label Available
+available.draw STACK
+available.info Free space
+available.colour 00FF00
+total.label Total
+total.draw LINE1
+total.info Total
+total.colour 000000
+quota.label Quota
+quota.draw LINE1
+quota.info Quota
+quota.colour 555555"
+EOF
 	exit 0
 fi
 
-echo "usedbydataset.value ${values[0]}"
-echo "usedbysnapshots.value ${values[2]}"
-echo "usedbychildren.value ${values[1]}"
-echo "usedbyrefreservation.value ${values[3]}"
-echo "available.value ${values[4]}"
-echo "total.value ${values[6]}"
-echo "quota.value ${values[5]}"
+echo <<EOF "usedbydataset.value ${values[0]}
+usedbysnapshots.value ${values[2]}
+usedbychildren.value ${values[1]}
+usedbyrefreservation.value ${values[3]}
+available.value ${values[4]}
+total.value ${values[6]}
+quota.value ${values[5]}"
+EOF
 
 exit 0