diff --git a/plugins/disk/lvm_ b/plugins/disk/lvm_
index 6c2ba72f..dad888ec 100755
--- a/plugins/disk/lvm_
+++ b/plugins/disk/lvm_
@@ -44,6 +44,9 @@ munin-node.
 
 EOF
 
+. $MUNIN_LIBDIR/plugins/plugin.sh
+
+
 if [ "$1" = "autoconf" ]; then
     if ! command -v lvs >/dev/null; then
         echo "no (lvs not found)"
@@ -64,7 +67,7 @@ fi
 vg=`echo $0 | awk '{ sub(".*lvm_","",\$1); print \$1; }'`
 
 clean_name() {
-    echo $1 | sed 's/[\/.-]/_/g'
+    echo "$(clean_fieldname "$1")"
 }
 
 
diff --git a/plugins/disk/lvm_snap_used b/plugins/disk/lvm_snap_used
index 87574a24..91a34012 100755
--- a/plugins/disk/lvm_snap_used
+++ b/plugins/disk/lvm_snap_used
@@ -18,6 +18,9 @@
 # 2012/01/27 - Sébastien Gross
 #            - Fix lvdisplay path
 
+
+. $MUNIN_LIBDIR/plugins/plugin.sh
+
 lvdisplay=$(which lvdisplay)
 
 if [ "$1" = "autoconf" ]; then
@@ -35,10 +38,20 @@ if [ "$1" = "config" ]; then
 	echo 'graph_title Allocated space for snapshot' 
 	echo 'graph_vlabel %'
 	echo 'graph_category disk'
-	echo 'graph_args --base 100'
-         ${lvdisplay} -C | awk '$3 ~ /^s/{print $1".label "$1" snapshot of "$5} '
-	exit 0
+	echo 'graph_args -l 0 -u 100 -r'
 fi
 
 
-${lvdisplay} -C | awk '$3 ~ /^s/{print $1".value",int($6)} '
+${lvdisplay} -C | awk '$3 ~ /^s/{print}' | while read line; do
+    name="$(echo $line | awk '{print $1}')"
+    id="$(clean_fieldname "$name")"
+    origin="$(echo $line | awk '{print $5}')"
+    origin="$(clean_fieldname "$origin")"
+    percent="$(echo $line | awk '{print $6}')"
+    
+    if [ "$1" = "config" ]; then
+        echo "$id.label $name snapshot of $origin"
+    else
+        echo "$id.value $percent"
+    fi
+done