diff --git a/plugins/zfs/zfs_list b/plugins/zfs/zfs_list
index 72134b74..3550fb05 100755
--- a/plugins/zfs/zfs_list
+++ b/plugins/zfs/zfs_list
@@ -31,7 +31,7 @@ fi
 if [ "$1" = "config" ]; then
 	for i in `zfs list -Hp | awk '{print $1}'`; do
 		values=( $(zfs get -p usedbydataset,usedbychildren,usedbysnapshots,usedbyrefreservation,available,quota $i | awk 'BEGIN {total=0;} { if( NR==1 ) next; } !/quota/ {total=total+$3;} {print $3} END{print total;}') )
-		fsname=`echo $i | sed 's/\//__/g'`
+		fsname=`echo $i | sed 's/\//__/g' | sed 's/-/_/g'`
 
 		echo <<EOF "multigraph zfs_list_$fsname
 graph_title $fsname usage
@@ -75,7 +75,7 @@ fi
 
 for i in `zfs list -Hp | awk '{print $1}'`; do
 	values=( $(zfs get -p usedbydataset,usedbychildren,usedbysnapshots,usedbyrefreservation,available,quota $i | awk 'BEGIN {total=0;} { if( NR==1 ) next; } !/quota/ {total=total+$3;} {print $3} END{print total;}') )
-	fsname=`echo $i | sed 's/\//__/g'`
+	fsname=`echo $i | sed 's/\//__/g' | sed 's/-/_/g'`
 
 echo <<EOF "multigraph zfs_list_$fsname
 usedbydataset.value ${values[0]}