diff --git a/files/munin-node b/files/munin-node
index 0e07575..fb9d484 100644
--- a/files/munin-node
+++ b/files/munin-node
@@ -56,7 +56,7 @@ user root
 env.mysqlopts --defaults-extra-file=/etc/mysql/debian.cnf
 
 [postfix_mailqueue]
-user (postfix)
+user postfix
 
 [postfix_mailstats]
 group adm
diff --git a/files/munin-node.lenny b/files/munin-node.lenny
index 0e07575..fb9d484 100644
--- a/files/munin-node.lenny
+++ b/files/munin-node.lenny
@@ -56,7 +56,7 @@ user root
 env.mysqlopts --defaults-extra-file=/etc/mysql/debian.cnf
 
 [postfix_mailqueue]
-user (postfix)
+user postfix
 
 [postfix_mailstats]
 group adm
diff --git a/files/munin-node.squeeze b/files/munin-node.squeeze
index 7f70042..22b5dec 100644
--- a/files/munin-node.squeeze
+++ b/files/munin-node.squeeze
@@ -64,7 +64,7 @@ env.mysqlopts --defaults-file=/etc/mysql/debian.cnf
 
 
 [postfix_mailqueue]
-user (postfix)
+user postfix
 
 [postfix_mailstats]
 group adm
@@ -83,3 +83,12 @@ user root
 user ejabberd
 env.statuses available away chat xa
 env.days 1 7 30
+
+# required for mounts in /root ("df: `/root/.dotfiles': Permission denied")
+[df*]
+user root
+# do not exclude "simfs" (OpenVZ)
+env.exclude none unknown iso9660 squashfs udf romfs ramfs debugfs
+
+[munin_stats]
+user munin
diff --git a/files/munin-node.squeeze.1.2.6-17 b/files/munin-node.squeeze.1.2.6-17
index 7f70042..3595c7f 100644
--- a/files/munin-node.squeeze.1.2.6-17
+++ b/files/munin-node.squeeze.1.2.6-17
@@ -64,7 +64,7 @@ env.mysqlopts --defaults-file=/etc/mysql/debian.cnf
 
 
 [postfix_mailqueue]
-user (postfix)
+user postfix
 
 [postfix_mailstats]
 group adm
diff --git a/manifests/client.pp b/manifests/client.pp
index 837f3ac..bf53b2a 100644
--- a/manifests/client.pp
+++ b/manifests/client.pp
@@ -32,9 +32,14 @@
 			case $vserver {
 				guest: { include munin::plugins::vserver }
 				default: {
-					include munin::plugins::linux
 					case $virtual {
-						xen0: { include munin::plugins::xen }
+						openvzve: { include munin::plugins::openvz }
+						default: {
+							include munin::plugins::linux
+							case $virtual {
+								xen0: { include munin::plugins::xen }
+							}
+						}
 					}
 				}
 			}
diff --git a/manifests/plugin.pp b/manifests/plugin.pp
index 04a54f9..12cc0ca 100644
--- a/manifests/plugin.pp
+++ b/manifests/plugin.pp
@@ -127,3 +127,13 @@
 	}
 
 }
+
+class munin::plugins::openvz inherits munin::plugins::vserver {
+
+	plugin {
+		[ df, df_inode, fw_packets, load, memory, threads, uptime, cpu, users, vmstat ]:
+			ensure => present;
+	}
+
+	include munin::plugins::interfaces
+}
diff --git a/templates/munin-node.conf.Debian.squeeze b/templates/munin-node.conf.Debian.squeeze
index da4cd7e..4565020 100644
--- a/templates/munin-node.conf.Debian.squeeze
+++ b/templates/munin-node.conf.Debian.squeeze
@@ -14,7 +14,6 @@ host <%= munin_host_real %>
 port <%= munin_port_real %>
 user root
 group root
-setsid yes
 
 # Regexps for files to ignore