diff --git a/debian/changelog b/debian/changelog
index a396f05..4f13e44 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -28,7 +28,8 @@ nagios-plugins (1.4.12-1) UNRELEASED; urgency=low
     perl of check_disk_smb, thanks Stephane Chazelas <stephane@artesyncp.com>
     for providing it (Closes: #478906)
   * add 34_fix_smbclient_check_disk_smb.dpatch which fixes usage of smbclient,
-    thanks Stephane Chazelas <stephane@artesyncp.com> for providing it
+    thanks Stephane Chazelas <stephane@artesyncp.com> for providing it and
+    adding ' around arguments in plugin configs
     (Closes: #478942)
   * add 35_check_http_date.dpatch which fixes date parsing of check_http,
     thanks Hilko Bengen <bengen@debian.org> for providing it (Closes: #460097)
diff --git a/debian/pluginconfig/breeze.cfg b/debian/pluginconfig/breeze.cfg
index c758326..2e89650 100644
--- a/debian/pluginconfig/breeze.cfg
+++ b/debian/pluginconfig/breeze.cfg
@@ -1,5 +1,5 @@
 # 'check_breeze' command definition
 define command {
 	command_name    check_breeze
-	command_line    /usr/lib/nagios/plugins/check_breeze -H $HOSTADDRESS$ -w $ARG1$ -c $ARG2$ 
+	command_line    /usr/lib/nagios/plugins/check_breeze -H '$HOSTADDRESS$' -w '$ARG1$' -c '$ARG2$'
 }
diff --git a/debian/pluginconfig/dhcp.cfg b/debian/pluginconfig/dhcp.cfg
index c3d4cc3..4798d43 100644
--- a/debian/pluginconfig/dhcp.cfg
+++ b/debian/pluginconfig/dhcp.cfg
@@ -4,12 +4,12 @@
 # 'check_dhcp' command definition
 define command{
 	command_name	check_dhcp
-	command_line	/usr/lib/nagios/plugins/check_dhcp -s $HOSTADDRESS$
+	command_line	/usr/lib/nagios/plugins/check_dhcp -s '$HOSTADDRESS$'
 	}
 
 # 'check_dhcp_interface' command definition
 define command{
 	command_name	check_dhcp_interface
-	command_line	/usr/lib/nagios/plugins/check_dhcp -s $HOSTADDRESS$ -i $ARG1$
+	command_line	/usr/lib/nagios/plugins/check_dhcp -s '$HOSTADDRESS$' -i '$ARG1$'
 	}
 
diff --git a/debian/pluginconfig/disk-smb.cfg b/debian/pluginconfig/disk-smb.cfg
index a2df567..b3d8218 100644
--- a/debian/pluginconfig/disk-smb.cfg
+++ b/debian/pluginconfig/disk-smb.cfg
@@ -1,54 +1,54 @@
 # 'check_disk_smb' command definition
 define command{
 	command_name	check_disk_smb
-	command_line	/usr/lib/nagios/plugins/check_disk_smb -H "$ARG1$" -s $ARG2$
+	command_line	/usr/lib/nagios/plugins/check_disk_smb -H '$ARG1$' -s '$ARG2$'
 	}
 
 
 # 'check_disk_smb_workgroup' command definition
 define command{
 	command_name	check_disk_smb_workgroup
-	command_line	/usr/lib/nagios/plugins/check_disk_smb -H "$ARG1$" -s $ARG2$ -W $ARG3$
+	command_line	/usr/lib/nagios/plugins/check_disk_smb -H '$ARG1$' -s '$ARG2$' -W '$ARG3$'
 	}
 
 
 # 'check_disk_smb_host' command definition
 define command{
 	command_name	check_disk_smb_host
-	command_line	/usr/lib/nagios/plugins/check_disk_smb -a $HOSTADDRESS$ -H "$ARG1$" -s $ARG2$
+	command_line	/usr/lib/nagios/plugins/check_disk_smb -a '$HOSTADDRESS$' -H '$ARG1$' -s '$ARG2$'
 	}
 
 
 # 'check_disk_smb_workgroup_host' command definition
 define command{
 	command_name	check_disk_smb_workgroup_host
-	command_line	/usr/lib/nagios/plugins/check_disk_smb -a $HOSTADDRESS$ -H "$ARG1$" -s $ARG2$ -W $ARG3$
+	command_line	/usr/lib/nagios/plugins/check_disk_smb -a '$HOSTADDRESS$' -H '$ARG1$' -s '$ARG2$' -W '$ARG3$'
 	}
 
 
 # 'check_disk_smb_user' command definition
 define command{
 	command_name	check_disk_smb_user
-	command_line	/usr/lib/nagios/plugins/check_disk_smb -H "$ARG1$" -s $ARG2$ -u $ARG3$ -p $ARG4$
+	command_line	/usr/lib/nagios/plugins/check_disk_smb -H '$ARG1$' -s '$ARG2$' -u '$ARG3$' -p '$ARG4$'
 	}
 
 
 # 'check_disk_smb_workgroup_user' command definition
 define command{
 	command_name	check_disk_smb_workgroup_user
-	command_line	/usr/lib/nagios/plugins/check_disk_smb -H "$ARG1$" -s $ARG2$ -W $ARG3$ -u $ARG4$ -p $ARG5$
+	command_line	/usr/lib/nagios/plugins/check_disk_smb -H '$ARG1$' -s '$ARG2$' -W '$ARG3$' -u '$ARG4$' -p '$ARG5$'
 	}
 
 
 # 'check_disk_smb_host_user' command definition
 define command{
 	command_name	check_disk_smb_host_user
-	command_line	/usr/lib/nagios/plugins/check_disk_smb -a $HOSTADDRESS$ -H "$ARG1$" -s $ARG2$ -u $ARG3$ -p $ARG4$
+	command_line	/usr/lib/nagios/plugins/check_disk_smb -a '$HOSTADDRESS$' -H '$ARG1$' -s '$ARG2$' -u '$ARG3$' -p '$ARG4$'
 	}
 
 
 # 'check_disk_smb_workgroup_host_user' command definition
 define command{
 	command_name	check_disk_smb_workgroup_host_user
-	command_line	/usr/lib/nagios/plugins/check_disk_smb -a $HOSTADDRESS$ -H "$ARG1$" -s $ARG2$ -W $ARG3$ -u $ARG4$ -p $ARG5$
+	command_line	/usr/lib/nagios/plugins/check_disk_smb -a '$HOSTADDRESS$' -H '$ARG1$' -s '$ARG2$' -W '$ARG3$' -u '$ARG4$' -p '$ARG5$'
 	}
diff --git a/debian/pluginconfig/disk.cfg b/debian/pluginconfig/disk.cfg
index 6d39d72..1fc46f9 100644
--- a/debian/pluginconfig/disk.cfg
+++ b/debian/pluginconfig/disk.cfg
@@ -1,19 +1,19 @@
 # 'check_disk' command definition
 define command{
 	command_name	check_disk
-	command_line	/usr/lib/nagios/plugins/check_disk -w $ARG1$ -c $ARG2$ -p $ARG3$
+	command_line	/usr/lib/nagios/plugins/check_disk -w '$ARG1$' -c '$ARG2$' -p '$ARG3$'
 	}
 
 # 'check_all_disks' command definition
 define command{
 	command_name	check_all_disks
-	command_line	/usr/lib/nagios/plugins/check_disk -w $ARG1$ -c $ARG2$
+	command_line	/usr/lib/nagios/plugins/check_disk -w '$ARG1$' -c '$ARG2$'
 	}
 
 # 'ssh_disk' command definition
 define command{
 	command_name	ssh_disk
-	command_line	/usr/lib/nagios/plugins/check_by_ssh -H $HOSTADDRESS$ -C '/usr/lib/nagios/plugins/check_disk -w $ARG1$ -c $ARG2$ -p $ARG3$'
+	command_line	/usr/lib/nagios/plugins/check_by_ssh -H '$HOSTADDRESS$' -C '/usr/lib/nagios/plugins/check_disk -w '\''$ARG1$' -c '\''$ARG2$'\'' -p '\''$ARG3$'\'
 	}
 
 ####
@@ -23,5 +23,5 @@ define command{
 # 'ssh_disk_4' command definition
 define command{
         command_name    ssh_disk_4
-        command_line    /usr/lib/nagios/plugins/check_by_ssh -H $HOSTADDRESS$ -C '/usr/lib/nagios/plugins/check_disk -w $ARG1$ -c $ARG2$ -p $ARG3$' -4
+        command_line    /usr/lib/nagios/plugins/check_by_ssh -H '$HOSTADDRESS$' -C '/usr/lib/nagios/plugins/check_disk -w '\''$ARG1$'\'' -c '\''$ARG2$'\'' -p '\''$ARG3$'\' -4
         }
diff --git a/debian/pluginconfig/dns.cfg b/debian/pluginconfig/dns.cfg
index 440c9d4..bdc169b 100644
--- a/debian/pluginconfig/dns.cfg
+++ b/debian/pluginconfig/dns.cfg
@@ -1,11 +1,11 @@
 # 'check_dns' command definition
 define command{
 	command_name	check_dns
-	command_line	/usr/lib/nagios/plugins/check_dns -H www.google.com -s $HOSTADDRESS$
+	command_line	/usr/lib/nagios/plugins/check_dns -H www.google.com -s '$HOSTADDRESS$'
 }
 
 # 'check_dig' command definition
 define command{
 	command_name    check_dig
-	command_line    /usr/lib/nagios/plugins/check_dig -H $HOSTADDRESS$ -l $ARG1$
+	command_line    /usr/lib/nagios/plugins/check_dig -H '$HOSTADDRESS$' -l '$ARG1$'
 }
diff --git a/debian/pluginconfig/dummy.cfg b/debian/pluginconfig/dummy.cfg
index 198c1c5..bfb7ef4 100644
--- a/debian/pluginconfig/dummy.cfg
+++ b/debian/pluginconfig/dummy.cfg
@@ -25,5 +25,5 @@ define command {
 # return-numeric definition
 define command {
 	command_name    return-numeric
-	command_line    /usr/lib/nagios/plugins/check_dummy $ARG1$
+	command_line    /usr/lib/nagios/plugins/check_dummy '$ARG1$'
 }
diff --git a/debian/pluginconfig/flexlm.cfg b/debian/pluginconfig/flexlm.cfg
index b5ba4e9..678f044 100644
--- a/debian/pluginconfig/flexlm.cfg
+++ b/debian/pluginconfig/flexlm.cfg
@@ -1,6 +1,6 @@
 # 'check_flexlm' command definition
 define command{
 	command_name	check_flexlm
-	command_line	/usr/lib/nagios/plugins/check_flexlm -F $ARG1$
+	command_line	/usr/lib/nagios/plugins/check_flexlm -F '$ARG1$'
 	}
 
diff --git a/debian/pluginconfig/fping.cfg b/debian/pluginconfig/fping.cfg
index 072f4d7..bf3baf6 100644
--- a/debian/pluginconfig/fping.cfg
+++ b/debian/pluginconfig/fping.cfg
@@ -1,5 +1,5 @@
 # 'check-fast-alive' command definition
 define command{
 	command_name	check-fast-alive
-	command_line	/usr/lib/nagios/plugins/check_fping -H $HOSTADDRESS$
+	command_line	/usr/lib/nagios/plugins/check_fping -H '$HOSTADDRESS$'
 	}
diff --git a/debian/pluginconfig/ftp.cfg b/debian/pluginconfig/ftp.cfg
index 1e332bc..d027c0f 100644
--- a/debian/pluginconfig/ftp.cfg
+++ b/debian/pluginconfig/ftp.cfg
@@ -1,7 +1,7 @@
 # 'check_ftp' command definition
 define command{
 	command_name	check_ftp
-	command_line	/usr/lib/nagios/plugins/check_ftp -H $HOSTADDRESS$
+	command_line	/usr/lib/nagios/plugins/check_ftp -H '$HOSTADDRESS$'
 	}
 
 ####
@@ -11,5 +11,5 @@ define command{
 # 'check_ftp_4' command definition
 define command{
         command_name    check_ftp_4
-        command_line    /usr/lib/nagios/plugins/check_ftp -H $HOSTADDRESS$ -4
+        command_line    /usr/lib/nagios/plugins/check_ftp -H '$HOSTADDRESS$' -4
         }
diff --git a/debian/pluginconfig/games.cfg b/debian/pluginconfig/games.cfg
index a5d3948..0ada476 100644
--- a/debian/pluginconfig/games.cfg
+++ b/debian/pluginconfig/games.cfg
@@ -1,14 +1,14 @@
 # 'check_quake' command definition
 define command{
 	command_name	check_quake
-	command_line	/usr/lib/nagios/plugins/check_game qs $HOSTADDRESS$
+	command_line	/usr/lib/nagios/plugins/check_game qs '$HOSTADDRESS$'
 	}
 
 
 # 'check_unreal' command definition
 define command{
 	command_name	check_unreal
-	command_line	/usr/lib/nagios/plugins/check_game uns $HOSTADDRESS$ -P $ARG1$ -p 8
+	command_line	/usr/lib/nagios/plugins/check_game uns '$HOSTADDRESS$' -P '$ARG1$' -p 8
 	}
 
 
diff --git a/debian/pluginconfig/hppjd.cfg b/debian/pluginconfig/hppjd.cfg
index 68eec72..cb15b5b 100644
--- a/debian/pluginconfig/hppjd.cfg
+++ b/debian/pluginconfig/hppjd.cfg
@@ -1,6 +1,6 @@
 # 'check_hpjd' command definition
 define command{
 	command_name	check_hpjd
-	command_line	/usr/lib/nagios/plugins/check_hpjd -H $HOSTADDRESS$ -C public
+	command_line	/usr/lib/nagios/plugins/check_hpjd -H '$HOSTADDRESS$' -C public
 	}
 
diff --git a/debian/pluginconfig/http.cfg b/debian/pluginconfig/http.cfg
index dc19078..eac88f8 100644
--- a/debian/pluginconfig/http.cfg
+++ b/debian/pluginconfig/http.cfg
@@ -1,38 +1,38 @@
 # 'check_http' command definition
 define command{
 	command_name	check_http
-	command_line	/usr/lib/nagios/plugins/check_http -H $HOSTADDRESS$ -I $HOSTADDRESS$
+	command_line	/usr/lib/nagios/plugins/check_http -H '$HOSTADDRESS$' -I '$HOSTADDRESS$'
 	}
 
 
 # 'check_http2' command definition
 define command{
 	command_name	check_http2
-	command_line	/usr/lib/nagios/plugins/check_http -H $ARG1$ -I $HOSTADDRESS$ -w $ARG2$ -c $ARG3$
+	command_line	/usr/lib/nagios/plugins/check_http -H '$ARG1$' -I '$HOSTADDRESS$' -w '$ARG2$' -c '$ARG3$'
 	}
 
 # 'check_squid' command definition
 define command{
 	command_name	check_squid
-	command_line	/usr/lib/nagios/plugins/check_http -H $HOSTADDRESS$ -p $ARG1$  -u $ARG2$  -e 'HTTP/1.0 200 OK'
+	command_line	/usr/lib/nagios/plugins/check_http -H '$HOSTADDRESS$' -p '$ARG1$'  -u '$ARG2$'  -e 'HTTP/1.0 200 OK'
 	}
 
 # 'check_https' command definition
 define command{
 	command_name    check_https
-	command_line	/usr/lib/nagios/plugins/check_http --ssl -H $HOSTADDRESS$ -I $HOSTADDRESS$
+	command_line	/usr/lib/nagios/plugins/check_http --ssl -H '$HOSTADDRESS$' -I '$HOSTADDRESS$'
 }
 
 # 'check_https_auth' command definition
 define command{
 	command_name	check_https_auth
-	command_line	/usr/lib/nagios/plugins/check_http --ssl -H $HOSTADDRESS$ -I $HOSTADDRESS$ -a $ARG1$
+	command_line	/usr/lib/nagios/plugins/check_http --ssl -H '$HOSTADDRESS$' -I '$HOSTADDRESS$' -a '$ARG1$'
 	}
 
 # 'check_cups' command definition
 define command{
 	command_name	check_cups
-	command_line	/usr/lib/nagios/plugins/check_http -H $HOSTADDRESS$ -p 631
+	command_line	/usr/lib/nagios/plugins/check_http -H '$HOSTADDRESS$' -p 631
 	}
 
 ####
@@ -42,36 +42,36 @@ define command{
 # 'check_http_4' command definition
 define command{
         command_name    check_http_4
-        command_line    /usr/lib/nagios/plugins/check_http -H $HOSTADDRESS$ -I $HOSTADDRESS$ -4
+        command_line    /usr/lib/nagios/plugins/check_http -H '$HOSTADDRESS$' -I '$HOSTADDRESS$' -4
         }
 
 
 # 'check_http2_4' command definition
 define command{
         command_name    check_http2_4
-        command_line    /usr/lib/nagios/plugins/check_http -H $ARG1$ -I $HOSTADDRESS$ -w $ARG2$ -c $ARG3$ -4
+        command_line    /usr/lib/nagios/plugins/check_http -H '$ARG1$' -I '$HOSTADDRESS$' -w '$ARG2$' -c '$ARG3$' -4
         }
 
 # 'check_squid_4' command definition
 define command{
         command_name    check_squid_4
-        command_line    /usr/lib/nagios/plugins/check_http -H $HOSTADDRESS$ -p $ARG1$  -u $ARG2$  -e 'HTTP/1.0 200 OK' -4
+        command_line    /usr/lib/nagios/plugins/check_http -H '$HOSTADDRESS$' -p '$ARG1$'  -u '$ARG2$'  -e 'HTTP/1.0 200 OK' -4
         }
 
 # 'check_https_4' command definition
 define command{
         command_name    check_https_4
-        command_line    /usr/lib/nagios/plugins/check_http --ssl -H $HOSTADDRESS$ -I $HOSTADDRESS$ -4
+        command_line    /usr/lib/nagios/plugins/check_http --ssl -H '$HOSTADDRESS$' -I '$HOSTADDRESS$' -4
 }
 
 # 'check_https_auth_4' command definition
 define command{
         command_name    check_https_auth_4
-        command_line    /usr/lib/nagios/plugins/check_http --ssl -H $HOSTADDRESS$ -I $HOSTADDRESS$ -a $ARG1$ -4
+        command_line    /usr/lib/nagios/plugins/check_http --ssl -H '$HOSTADDRESS$' -I '$HOSTADDRESS$' -a '$ARG1$' -4
         }
 
 # 'check_cups_4' command definition
 define command{
 	command_name	check_cups_4
-	command_line	/usr/lib/nagios/plugins/check_http -H $HOSTADDRESS$ -p 631 -4
+	command_line	/usr/lib/nagios/plugins/check_http -H '$HOSTADDRESS$' -p 631 -4
 	}
diff --git a/debian/pluginconfig/ifstatus.cfg b/debian/pluginconfig/ifstatus.cfg
index bc3201b..e3fb54a 100644
--- a/debian/pluginconfig/ifstatus.cfg
+++ b/debian/pluginconfig/ifstatus.cfg
@@ -1,23 +1,23 @@
 # 'check_ifstatus' command definition
 define command{
 	command_name	check_ifstatus
-	command_line	/usr/lib/nagios/plugins/check_ifstatus -H $HOSTADDRESS$ -C $ARG1$ 
+	command_line	/usr/lib/nagios/plugins/check_ifstatus -H '$HOSTADDRESS$' -C '$ARG1$'
 	}
 
 # 'check_ifstatus_exclude' command definition
 define command{
         command_name    check_ifstatus_exclude
-        command_line    /usr/lib/nagios/plugins/check_ifstatus -H $HOSTADDRESS$ -C $ARG1$ -x $ARG2$
+        command_line    /usr/lib/nagios/plugins/check_ifstatus -H '$HOSTADDRESS$' -C '$ARG1$' -x '$ARG2$'
         }
 
 # 'check_ifoperstatus_ifindex' command definition
 define command{
 	command_name	check_ifoperstatus_ifindex
-	command_line	/usr/lib/nagios/plugins/check_ifoperstatus -H $HOSTADDRESS$ -C $ARG1$ -k $ARG2$
+	command_line	/usr/lib/nagios/plugins/check_ifoperstatus -H '$HOSTADDRESS$' -C '$ARG1$' -k '$ARG2$'
 	}
 
 # 'check_ifoperstatus_ifdescr' command definition
 define command{
 	command_name	check_ifoperstatus_ifdescr
-	command_line	/usr/lib/nagios/plugins/check_ifoperstatus -H $HOSTADDRESS$ -C $ARG1$ -d $ARG2$
+	command_line	/usr/lib/nagios/plugins/check_ifoperstatus -H '$HOSTADDRESS$' -C '$ARG1$' -d '$ARG2$'
 	}
diff --git a/debian/pluginconfig/ldap.cfg b/debian/pluginconfig/ldap.cfg
index 3d84646..30d5279 100644
--- a/debian/pluginconfig/ldap.cfg
+++ b/debian/pluginconfig/ldap.cfg
@@ -1,13 +1,13 @@
 # 'check_ldap' command definition
 define command{
 	command_name	check_ldap
-	command_line	/usr/lib/nagios/plugins/check_ldap -H $HOSTADDRESS$ -b $ARG1$
+	command_line	/usr/lib/nagios/plugins/check_ldap -H '$HOSTADDRESS$' -b '$ARG1$'
 	}
 
 # 'check_ldaps' command definition
 define command{
 	command_name	check_ldaps
-	command_line	/usr/lib/nagios/plugins/check_ldaps -H $HOSTADDRESS$ -b $ARG1$
+	command_line	/usr/lib/nagios/plugins/check_ldaps -H '$HOSTADDRESS$' -b '$ARG1$'
 	}
 
 ####
@@ -17,11 +17,11 @@ define command{
 # 'check_ldap_4' command definition
 define command{
 	command_name	check_ldap_4
-	command_line	/usr/lib/nagios/plugins/check_ldap -H $HOSTADDRESS$ -b $ARG1$ -4
+	command_line	/usr/lib/nagios/plugins/check_ldap -H '$HOSTADDRESS$' -b '$ARG1$' -4
 	}
 
 # 'check_ldaps_4' command definition
 define command{
 	command_name	check_ldaps_4
-	command_line	/usr/lib/nagios/plugins/check_ldaps -H $HOSTADDRESS$ -b $ARG1$ -4
-	}
\ No newline at end of file
+	command_line	/usr/lib/nagios/plugins/check_ldaps -H '$HOSTADDRESS$' -b '$ARG1$' -4
+	}
diff --git a/debian/pluginconfig/load.cfg b/debian/pluginconfig/load.cfg
index 04810e1..c87efde 100644
--- a/debian/pluginconfig/load.cfg
+++ b/debian/pluginconfig/load.cfg
@@ -1,6 +1,6 @@
 # 'check_load' command definition
 define command{
 	command_name	check_load
-	command_line	/usr/lib/nagios/plugins/check_load --warning=$ARG1$,$ARG2$,$ARG3$ --critical=$ARG4$,$ARG5$,$ARG6$
+	command_line	/usr/lib/nagios/plugins/check_load --warning='$ARG1$,$ARG2$,$ARG3$' --critical='$ARG4$,$ARG5$,$ARG6$'
 	}
 
diff --git a/debian/pluginconfig/mail.cfg b/debian/pluginconfig/mail.cfg
index a5059d3..c332c20 100644
--- a/debian/pluginconfig/mail.cfg
+++ b/debian/pluginconfig/mail.cfg
@@ -1,63 +1,63 @@
 # 'check_pop' command definition
 define command {
 	command_name	check_pop
-	command_line	/usr/lib/nagios/plugins/check_pop -H $HOSTADDRESS$
+	command_line	/usr/lib/nagios/plugins/check_pop -H '$HOSTADDRESS$'
 }
 
 
 # 'check_smtp' command definition
 define command {
 	command_name	check_smtp
-	command_line	/usr/lib/nagios/plugins/check_smtp -H $HOSTADDRESS$
+	command_line	/usr/lib/nagios/plugins/check_smtp -H '$HOSTADDRESS$'
 }
 
 # 'check_ssmtp' command definition
 define command {
 	command_name	check_ssmtp
-	command_line	/usr/lib/nagios/plugins/check_ssmtp -H $HOSTADDRESS$
+	command_line	/usr/lib/nagios/plugins/check_ssmtp -H '$HOSTADDRESS$'
 }
 
 # 'check_imap' command definition
 define command {
 	command_name	check_imap
-	command_line	/usr/lib/nagios/plugins/check_imap -H $HOSTADDRESS$
+	command_line	/usr/lib/nagios/plugins/check_imap -H '$HOSTADDRESS$'
 }
 
 # 'check_spop' command definition
 define command {
 	command_name	check_spop
-	command_line	/usr/lib/nagios/plugins/check_pop -p 995 -H $HOSTADDRESS$ -S
+	command_line	/usr/lib/nagios/plugins/check_pop -p 995 -H '$HOSTADDRESS$' -S
 }
 
 
 # 'check_simap' command definition
 define command {
 	command_name	check_simap
-	command_line	/usr/lib/nagios/plugins/check_imap -p 993 -H $HOSTADDRESS$ -S
+	command_line	/usr/lib/nagios/plugins/check_imap -p 993 -H '$HOSTADDRESS$' -S
 }
 
 # 'check-mailq' for sendmail
 define command {
         command_name    check_mailq_sendmail
-	command_line    /usr/lib/nagios/plugins/check_mailq -w $ARG1$ -c $ARG2$ -M sendmail
+	command_line    /usr/lib/nagios/plugins/check_mailq -w '$ARG1$' -c '$ARG2$' -M sendmail
 }
 
 # 'check-mailq' for postfix
 define command {
         command_name    check_mailq_postfix
-	command_line    /usr/lib/nagios/plugins/check_mailq -w $ARG1$ -c $ARG2$ -M postfix
+	command_line    /usr/lib/nagios/plugins/check_mailq -w '$ARG1$' -c '$ARG2$' -M postfix
 }
 
 # 'check-mailq' for exim
 define command {
         command_name    check_mailq_exim
-	command_line    /usr/lib/nagios/plugins/check_mailq -w $ARG1$ -c $ARG2$ -M exim
+	command_line    /usr/lib/nagios/plugins/check_mailq -w '$ARG1$' -c '$ARG2$' -M exim
 }
 
 # 'check-mailq' for qmail
 define command {
         command_name    check_mailq_qmail
-	command_line    /usr/lib/nagios/plugins/check_mailq -w $ARG1$ -c $ARG2$ -M qmail
+	command_line    /usr/lib/nagios/plugins/check_mailq -w '$ARG1$' -c '$ARG2$' -M qmail
 }
 
 ####
@@ -67,35 +67,35 @@ define command {
 # 'check_pop_4' command definition
 define command {
         command_name    check_pop_4
-        command_line    /usr/lib/nagios/plugins/check_pop -H $HOSTADDRESS$ -4
+        command_line    /usr/lib/nagios/plugins/check_pop -H '$HOSTADDRESS$' -4
 }
 
 # 'check_smtp_4' command definition
 define command {
         command_name    check_smtp_4
-        command_line    /usr/lib/nagios/plugins/check_smtp -H $HOSTADDRESS$ -4
+        command_line    /usr/lib/nagios/plugins/check_smtp -H '$HOSTADDRESS$' -4
 }
 
 # 'check_ssmtp_4' command definition
 define command {
         command_name    check_ssmtp_4
-        command_line    /usr/lib/nagios/plugins/check_ssmtp -H $HOSTADDRESS$ -4
+        command_line    /usr/lib/nagios/plugins/check_ssmtp -H '$HOSTADDRESS$' -4
 }
 
 # 'check_imap_4' command definition
 define command {
         command_name    check_imap_4
-        command_line    /usr/lib/nagios/plugins/check_imap -H $HOSTADDRESS$ -4
+        command_line    /usr/lib/nagios/plugins/check_imap -H '$HOSTADDRESS$' -4
 }
 
 # 'check_spop_4' command definition
 define command {
         command_name    check_spop_4
-        command_line    /usr/lib/nagios/plugins/check_pop -p 995 -H $HOSTADDRESS$ -S -4
+        command_line    /usr/lib/nagios/plugins/check_pop -p 995 -H '$HOSTADDRESS$' -S -4
 }
 
 # 'check_simap_4' command definition
 define command {
         command_name    check_simap_4
-        command_line    /usr/lib/nagios/plugins/check_imap -p 993 -H $HOSTADDRESS$ -S -4
+        command_line    /usr/lib/nagios/plugins/check_imap -p 993 -H '$HOSTADDRESS$' -S -4
 }
diff --git a/debian/pluginconfig/mrtg.cfg b/debian/pluginconfig/mrtg.cfg
index 1ad25fa..9a4c626 100644
--- a/debian/pluginconfig/mrtg.cfg
+++ b/debian/pluginconfig/mrtg.cfg
@@ -1,14 +1,14 @@
 # 'check_mrtg' command definition
 define command{
 	command_name	check_mrtg
-	command_line	/usr/lib/nagios/plugins/check_mrtg $ARG1$ 10 AVG $ARG2$ $ARG3$ $ARG4$ $ARG5$ $ARG6$
+	command_line	/usr/lib/nagios/plugins/check_mrtg '$ARG1$' 10 AVG '$ARG2$' '$ARG3$' '$ARG4$' '$ARG5$' '$ARG6$'
 	}
 
 
 # 'traffic_average' command definition
 define command{
 	command_name	traffic_average
-	command_line	/usr/lib/nagios/plugins/check_mrtgtraf $ARG1$ 10 AVG $ARG2$ $ARG3$ $ARG4$ $ARG5$
+	command_line	/usr/lib/nagios/plugins/check_mrtgtraf '$ARG1$' 10 AVG '$ARG2$' '$ARG3$' '$ARG4$' '$ARG5$'
 	}
 
 
diff --git a/debian/pluginconfig/mysql.cfg b/debian/pluginconfig/mysql.cfg
index a1adf9c..aecba69 100644
--- a/debian/pluginconfig/mysql.cfg
+++ b/debian/pluginconfig/mysql.cfg
@@ -1,17 +1,17 @@
 # 'check_mysql' command definition
 define command{
         command_name    check_mysql
-	command_line    /usr/lib/nagios/plugins/check_mysql -H $HOSTADDRESS$
+	command_line    /usr/lib/nagios/plugins/check_mysql -H '$HOSTADDRESS$'
 }
 
 # 'check_mysql_cmdlinecred' command definition
 define command{
 	command_name    check_mysql_cmdlinecred
-	command_line    /usr/lib/nagios/plugins/check_mysql -H $HOSTADDRESS$ -u $ARG1$ -p $ARG2$
+	command_line    /usr/lib/nagios/plugins/check_mysql -H '$HOSTADDRESS$' -u '$ARG1$' -p '$ARG2$'
 }
 
 # 'check_mysql_database' command definition
 define command{
 	command_name	check_mysql_database
-	command_line	/usr/lib/nagios/plugins/check_mysql -d $ARG3$ -H $HOSTADDRESS$ -u $ARG1$ -p $ARG2$
+	command_line	/usr/lib/nagios/plugins/check_mysql -d '$ARG3$' -H '$HOSTADDRESS$' -u '$ARG1$' -p '$ARG2$'
 }
diff --git a/debian/pluginconfig/netware.cfg b/debian/pluginconfig/netware.cfg
index cea6348..bc5f9d7 100644
--- a/debian/pluginconfig/netware.cfg
+++ b/debian/pluginconfig/netware.cfg
@@ -1,84 +1,84 @@
 # 'check_netware_logins' command definition
 define command{
 	command_name	check_netware_logins
-	command_line	/usr/lib/nagios/plugins/check_nwstat -H $HOSTADDRESS$ -v "LOGINS" -w $ARG1$ -c $ARG2$
+	command_line	/usr/lib/nagios/plugins/check_nwstat -H '$HOSTADDRESS$' -v "LOGINS" -w '$ARG1$' -c '$ARG2$'
 	}
 
 
 # 'check_nwstat_conns' command definition
 define command{
 	command_name	check_nwstat_conns
-	command_line	/usr/lib/nagios/plugins/check_nwstat -H $HOSTADDRESS$ -v CONNS -w $ARG1$ -c $ARG2$
+	command_line	/usr/lib/nagios/plugins/check_nwstat -H '$HOSTADDRESS$' -v CONNS -w '$ARG1$' -c '$ARG2$'
 	}
 
 
 # 'check_netware_1load' command definition
 define command{
 	command_name	check_netware_1load
-	command_line	/usr/lib/nagios/plugins/check_nwstat -H $HOSTADDRESS$ -v "LOAD1" -w 70 -c 90
+	command_line	/usr/lib/nagios/plugins/check_nwstat -H '$HOSTADDRESS$' -v "LOAD1" -w 70 -c 90
 	}
 
 
 # 'check_netware_5load' command definition
 define command{
 	command_name	check_netware_5load
-	command_line	/usr/lib/nagios/plugins/check_nwstat -H $HOSTADDRESS$ -v "LOAD5" -w 70 -c 90
+	command_line	/usr/lib/nagios/plugins/check_nwstat -H '$HOSTADDRESS$' -v "LOAD5" -w 70 -c 90
 	}
 
 
 # 'check_netware_15load' command definition
 define command{
 	command_name	check_netware_15load
-	command_line	/usr/lib/nagios/plugins/check_nwstat -H $HOSTADDRESS$ -v "LOAD15" -w 70 -c 90
+	command_line	/usr/lib/nagios/plugins/check_nwstat -H '$HOSTADDRESS$' -v "LOAD15" -w 70 -c 90
 	}
 
 
 # 'check_nwstat_vol_p' command definition
 define command{
 	command_name	check_nwstat_vol_p
-	command_line	/usr/lib/nagios/plugins/check_nwstat -H $HOSTADDRESS$ -v VPF$ARG1$ -w $ARG2$ -c $ARG3$
+	command_line	/usr/lib/nagios/plugins/check_nwstat -H '$HOSTADDRESS$' -v VPF'$ARG1$' -w '$ARG2$' -c '$ARG3$'
 	}
 
 
 # 'check_nwstat_vol_k' command definition
 define command{
 	command_name	check_nwstat_vol_k
-	command_line	/usr/lib/nagios/plugins/check_nwstat -H $HOSTADDRESS$ -v VKF$ARG1$ -w $ARG2$ -c $ARG3$
+	command_line	/usr/lib/nagios/plugins/check_nwstat -H '$HOSTADDRESS$' -v VKF'$ARG1$' -w '$ARG2$' -c '$ARG3$'
 	}
 
 
 # 'check_nwstat_ltch' command definition
 define command{
 	command_name	check_nwstat_ltch
-	command_line	/usr/lib/nagios/plugins/check_nwstat -H $HOSTADDRESS$ -v LTCH -w $ARG1$ -c $ARG2$
+	command_line	/usr/lib/nagios/plugins/check_nwstat -H '$HOSTADDRESS$' -v LTCH -w '$ARG1$' -c '$ARG2$'
 	}
 
 
 # 'check_nwstat_puprb' command definition
 define command{
 	command_name	check_nwstat_puprb
-	command_line	/usr/lib/nagios/plugins/check_nwstat -H $HOSTADDRESS$ -v PUPRB -w $ARG1$ -c $ARG2$
+	command_line	/usr/lib/nagios/plugins/check_nwstat -H '$HOSTADDRESS$' -v PUPRB -w '$ARG1$' -c '$ARG2$'
 	}
 
 
 # 'check_nwstat_dsdb' command definition
 define command{
 	command_name	check_nwstat_dsdb
-	command_line	/usr/lib/nagios/plugins/check_nwstat -H $HOSTADDRESS$ -v DSDB
+	command_line	/usr/lib/nagios/plugins/check_nwstat -H '$HOSTADDRESS$' -v DSDB
 	}
 
 
 # 'check_netware_abend' command definition
 define command{
 	command_name	check_netware_abend
-	command_line	/usr/lib/nagios/plugins/check_nwstat -H $HOSTADDRESS$ -v "ABENDS" -w 10 -c 30
+	command_line	/usr/lib/nagios/plugins/check_nwstat -H '$HOSTADDRESS$' -v "ABENDS" -w 10 -c 30
 	}
 
 
 # 'check_nwstat_csprocs' command definition
 define command{
 	command_name	check_nwstat_csprocs
-	command_line	/usr/lib/nagios/plugins/check_nwstat -H $HOSTADDRESS$ -v CSPROCS -w $ARG1$ -c $ARG2$
+	command_line	/usr/lib/nagios/plugins/check_nwstat -H '$HOSTADDRESS$' -v CSPROCS -w '$ARG1$' -c '$ARG2$'
 	}
 
 
diff --git a/debian/pluginconfig/news.cfg b/debian/pluginconfig/news.cfg
index 95379bf..2472f70 100644
--- a/debian/pluginconfig/news.cfg
+++ b/debian/pluginconfig/news.cfg
@@ -1,7 +1,7 @@
 # 'check_nntp' command definition
 define command{
 	command_name	check_nntp
-	command_line	/usr/lib/nagios/plugins/check_nntp -H $HOSTADDRESS$
+	command_line	/usr/lib/nagios/plugins/check_nntp -H '$HOSTADDRESS$'
 	}
 
 ####
@@ -11,5 +11,5 @@ define command{
 # 'check_nntp_4' command definition
 define command{
         command_name    check_nntp_4
-        command_line    /usr/lib/nagios/plugins/check_nntp -H $HOSTADDRESS$ -4
+        command_line    /usr/lib/nagios/plugins/check_nntp -H '$HOSTADDRESS$' -4
         }
diff --git a/debian/pluginconfig/nt.cfg b/debian/pluginconfig/nt.cfg
index 8f6ff81..8f01d1a 100644
--- a/debian/pluginconfig/nt.cfg
+++ b/debian/pluginconfig/nt.cfg
@@ -1,5 +1,5 @@
 # 'check_nt' command definition
 define command {
 	command_name    check_nt
-	command_line    /usr/lib/nagios/plugins/check_nt -H $HOSTADDRESS$ -v $ARG1$
+	command_line    /usr/lib/nagios/plugins/check_nt -H '$HOSTADDRESS$' -v '$ARG1$'
 }
diff --git a/debian/pluginconfig/ntp.cfg b/debian/pluginconfig/ntp.cfg
index 08cbac8..3cd6e6b 100644
--- a/debian/pluginconfig/ntp.cfg
+++ b/debian/pluginconfig/ntp.cfg
@@ -1,17 +1,17 @@
 # 'check_ntp' command definition
 define command{
 	command_name	check_ntp
-	command_line	/usr/lib/nagios/plugins/check_ntp_peer -H $HOSTADDRESS$
+	command_line	/usr/lib/nagios/plugins/check_ntp_peer -H '$HOSTADDRESS$'
 	}
 
 # 'check_ntp_ntpq' command definition
 define command{
 	command_name	check_ntp_ntpq
-	command_line	/usr/lib/nagios/plugins/check_ntp_peer -H $HOSTADDRESS$ -j 10 -k 15
+	command_line	/usr/lib/nagios/plugins/check_ntp_peer -H '$HOSTADDRESS$' -j 10 -k 15
 	}
 
 # 'check_time' command definition
 define command{
 	command_name	check_time
-	command_line	/usr/lib/nagios/plugins/check_time -H $HOSTADDRESS$
+	command_line	/usr/lib/nagios/plugins/check_time -H '$HOSTADDRESS$'
 	}
diff --git a/debian/pluginconfig/pgsql.cfg b/debian/pluginconfig/pgsql.cfg
index 16ea208..d7213f9 100644
--- a/debian/pluginconfig/pgsql.cfg
+++ b/debian/pluginconfig/pgsql.cfg
@@ -1,7 +1,7 @@
 # 'check_pgsql' command definition
 define command{
 	command_name	check_pgsql
-	command_line	/usr/lib/nagios/plugins/check_pgsql -H $HOSTADDRESS$ 
+	command_line	/usr/lib/nagios/plugins/check_pgsql -H '$HOSTADDRESS$'
 	}
 
 ####
@@ -11,5 +11,5 @@ define command{
 # 'check_pgsql_4' command definition
 define command{
         command_name    check_pgsql_4
-        command_line    /usr/lib/nagios/plugins/check_pgsql -H $HOSTADDRESS$ -4
+        command_line    /usr/lib/nagios/plugins/check_pgsql -H '$HOSTADDRESS$' -4
         }
diff --git a/debian/pluginconfig/ping.cfg b/debian/pluginconfig/ping.cfg
index 87bf3ff..f6a17fb 100644
--- a/debian/pluginconfig/ping.cfg
+++ b/debian/pluginconfig/ping.cfg
@@ -1,35 +1,35 @@
 # 'check_ping' command definition
 define command{
 	command_name	check_ping
-	command_line	/usr/lib/nagios/plugins/check_ping -H $HOSTADDRESS$ -w $ARG1$ -c $ARG2$
+	command_line	/usr/lib/nagios/plugins/check_ping -H '$HOSTADDRESS$' -w '$ARG1$' -c '$ARG2$'
 	}
 
 
 # 'check-host-alive' command definition
 define command{
 	command_name	check-host-alive
-	command_line	/usr/lib/nagios/plugins/check_ping -H $HOSTADDRESS$ -w 5000,100% -c 5000,100% -p 1
+	command_line	/usr/lib/nagios/plugins/check_ping -H '$HOSTADDRESS$' -w 5000,100% -c 5000,100% -p 1
 	}
 
 
 # 'check-printer-alive' command definition
 define command{
 	command_name	check-printer-alive
-	command_line	/usr/lib/nagios/plugins/check_ping -H $HOSTADDRESS$ -w 5000,100% -c 5000,100% -p 1
+	command_line	/usr/lib/nagios/plugins/check_ping -H '$HOSTADDRESS$' -w 5000,100% -c 5000,100% -p 1
 	}
 
 
 # 'check-switch-alive' command definition
 define command{
 	command_name	check-switch-alive
-	command_line	/usr/lib/nagios/plugins/check_ping $HOSTADDRESS$ -w 5000,100% -c 5000,100% -p 1
+	command_line	/usr/lib/nagios/plugins/check_ping '$HOSTADDRESS$' -w 5000,100% -c 5000,100% -p 1
 	}
 
 
 # 'check-router-alive' command definition
 define command{
 	command_name	check-router-alive
-	command_line	/usr/lib/nagios/plugins/check_ping -H $HOSTADDRESS$ -w 5000,100% -c 5000,100% -p 1
+	command_line	/usr/lib/nagios/plugins/check_ping -H '$HOSTADDRESS$' -w 5000,100% -c 5000,100% -p 1
 	}
 
 ####
@@ -39,34 +39,34 @@ define command{
 # 'check_ping_4' command definition
 define command{
 	command_name	check_ping_4
-	command_line	/usr/lib/nagios/plugins/check_ping -H $HOSTADDRESS$ -w $ARG1$ -c $ARG2$ -4
+	command_line	/usr/lib/nagios/plugins/check_ping -H '$HOSTADDRESS$' -w '$ARG1$' -c '$ARG2$' -4
 	}
 
 
 # 'check-host-alive_4' command definition
 define command{
 	command_name	check-host-alive_4
-	command_line	/usr/lib/nagios/plugins/check_ping -H $HOSTADDRESS$ -w 5000,100% -c 5000,100% -p 1 -4
+	command_line	/usr/lib/nagios/plugins/check_ping -H '$HOSTADDRESS$' -w 5000,100% -c 5000,100% -p 1 -4
 	}
 
 
 # 'check-printer-alive_4' command definition
 define command{
 	command_name	check-printer-alive_4
-	command_line	/usr/lib/nagios/plugins/check_ping -H $HOSTADDRESS$ -w 5000,100% -c 5000,100% -p 1 -4
+	command_line	/usr/lib/nagios/plugins/check_ping -H '$HOSTADDRESS$' -w 5000,100% -c 5000,100% -p 1 -4
 	}
 
 
 # 'check-switch-alive_4' command definition
 define command{
 	command_name	check-switch-alive_4
-	command_line	/usr/lib/nagios/plugins/check_ping $HOSTADDRESS$ -w 5000,100% -c 5000,100% -p 1 -4
+	command_line	/usr/lib/nagios/plugins/check_ping '$HOSTADDRESS$' -w 5000,100% -c 5000,100% -p 1 -4
 	}
 
 
 # 'check-router-alive_4' command definition
 define command{
 	command_name	check-router-alive_4
-	command_line	/usr/lib/nagios/plugins/check_ping -H $HOSTADDRESS$ -w 5000,100% -c 5000,100% -p 1 -4
+	command_line	/usr/lib/nagios/plugins/check_ping -H '$HOSTADDRESS$' -w 5000,100% -c 5000,100% -p 1 -4
 	}
 
diff --git a/debian/pluginconfig/procs.cfg b/debian/pluginconfig/procs.cfg
index 115df34..47158e4 100644
--- a/debian/pluginconfig/procs.cfg
+++ b/debian/pluginconfig/procs.cfg
@@ -1,20 +1,20 @@
 # 'check_procs' command definition
 define command{
 	command_name	check_procs
-	command_line	/usr/lib/nagios/plugins/check_procs -w $ARG1$ -c $ARG2$
+	command_line	/usr/lib/nagios/plugins/check_procs -w '$ARG1$' -c '$ARG2$'
 	}
 
 
 # 'check_procs_zombie' command definition
 define command{
 	command_name	check_procs_zombie
-	command_line	/usr/lib/nagios/plugins/check_procs -w $ARG1$ -c $ARG2$ -s Z
+	command_line	/usr/lib/nagios/plugins/check_procs -w '$ARG1$' -c '$ARG2$' -s Z
 	}
 
 
 # 'check_procs_httpd' command definition
 define command{
 	command_name	check_procs_httpd
-	command_line	/usr/lib/nagios/plugins/check_procs -w 5:$ARG1$ -c 1:$ARG2$ -C httpd
+	command_line	/usr/lib/nagios/plugins/check_procs -w 5:'$ARG1$' -c 1:'$ARG2$' -C httpd
 	}
 
diff --git a/debian/pluginconfig/radius.cfg b/debian/pluginconfig/radius.cfg
index 047deb4..beb38f7 100644
--- a/debian/pluginconfig/radius.cfg
+++ b/debian/pluginconfig/radius.cfg
@@ -1,6 +1,6 @@
 # 'check_radius' command definition
 define command{
 	command_name	check_radius
-	command_line	/usr/lib/nagios/plugins/check_radius $ARG1$ $ARG2$ $HOSTADDRESS$ 1812 $ARG3$
+	command_line	/usr/lib/nagios/plugins/check_radius '$ARG1$' '$ARG2$' '$HOSTADDRESS$' 1812 '$ARG3$'
 	}
 
diff --git a/debian/pluginconfig/real.cfg b/debian/pluginconfig/real.cfg
index 47b0e03..3afb59c 100644
--- a/debian/pluginconfig/real.cfg
+++ b/debian/pluginconfig/real.cfg
@@ -1,13 +1,13 @@
 # 'check_real_url' command definition
 define command{
 	command_name	check_real_url
-	command_line	/usr/lib/nagios/plugins/check_real $HOSTADDRESS$ -p $ARG1$ -wt $ARG2$ -ct $ARG3$ -to 5 -u $ARG4$
+	command_line	/usr/lib/nagios/plugins/check_real '$HOSTADDRESS$' -p '$ARG1$' -wt '$ARG2$' -ct '$ARG3$' -to 5 -u '$ARG4$'
 	}
 
 
 # 'check_real' command definition
 define command{
 	command_name	check_real
-	command_line	/usr/lib/nagios/plugins/check_real $HOSTADDRESS$ -p $ARG1$ -wt $ARG2$ -ct $ARG3$ -to 5
+	command_line	/usr/lib/nagios/plugins/check_real '$HOSTADDRESS$' -p '$ARG1$' -wt '$ARG2$' -ct '$ARG3$' -to 5
 	}
 
diff --git a/debian/pluginconfig/rpc-nfs.cfg b/debian/pluginconfig/rpc-nfs.cfg
index 7343abe..0a551f4 100644
--- a/debian/pluginconfig/rpc-nfs.cfg
+++ b/debian/pluginconfig/rpc-nfs.cfg
@@ -2,13 +2,13 @@
 # 'check-rpc' command definition
 define command{
 	command_name	check-rpc
-	command_line	/usr/lib/nagios/plugins/check_rpc -H $HOSTADDRESS$ -C $ARG1$
+	command_line	/usr/lib/nagios/plugins/check_rpc -H '$HOSTADDRESS$' -C '$ARG1$'
 	}
 
 
 # 'check-nfs' command definition
 define command{
 	command_name	check-nfs
-	command_line	/usr/lib/nagios/plugins/check_rpc -H $HOSTADDRESS$ -C nfs -c2,3
+	command_line	/usr/lib/nagios/plugins/check_rpc -H '$HOSTADDRESS$' -C nfs -c2,3
 	}
 
diff --git a/debian/pluginconfig/snmp.cfg b/debian/pluginconfig/snmp.cfg
index b44f8a0..1bc5900 100644
--- a/debian/pluginconfig/snmp.cfg
+++ b/debian/pluginconfig/snmp.cfg
@@ -1,139 +1,139 @@
 # 'snmp_load' command definition
 define command{
 	command_name	snmp_load
-	command_line	/usr/lib/nagios/plugins/check_snmp -H $HOSTADDRESS$ -C $ARG1$ -o .1.3.6.1.4.1.2021.10.1.5.1,.1.3.6.1.4.1.2021.10.1.5.2,.1.3.6.1.4.1.2021.10.1.5.3 -w :$ARG2$,:$ARG3$,:$ARG4$ -c :$ARG5$,:$ARG6$,:$ARG7$ -l load
+	command_line	/usr/lib/nagios/plugins/check_snmp -H '$HOSTADDRESS$' -C '$ARG1$' -o .1.3.6.1.4.1.2021.10.1.5.1,.1.3.6.1.4.1.2021.10.1.5.2,.1.3.6.1.4.1.2021.10.1.5.3 -w :'$ARG2$',:'$ARG3$',:'$ARG4$' -c :'$ARG5$',:'$ARG6$',:'$ARG7$' -l load
 	}
 
 
 # 'snmp_cpustats' command definition
 define command{
 	command_name	snmp_cpustats
-	command_line	/usr/lib/nagios/plugins/check_snmp -H $HOSTADDRESS$ -C $ARG1$ -o .1.3.6.1.4.1.2021.11.9.0,.1.3.6.1.4.1.2021.11.10.0,.1.3.6.1.4.1.2021.11.11.0 -l 'CPU usage (user system idle)' -u '%'
+	command_line	/usr/lib/nagios/plugins/check_snmp -H '$HOSTADDRESS$' -C '$ARG1$' -o .1.3.6.1.4.1.2021.11.9.0,.1.3.6.1.4.1.2021.11.10.0,.1.3.6.1.4.1.2021.11.11.0 -l 'CPU usage (user system idle)' -u '%'
 	}
 
 
 # 'snmp_procname' command definition
 define command{
 	command_name	snmp_procname
-	command_line	/usr/lib/nagios/plugins/check_snmp -H $HOSTADDRESS$ -C $ARG1$ -o .1.3.6.1.4.1.2021.2.1.5.$ARG2$ -w $ARG3$:$ARG4$ -c $ARG5$:$ARG6$
+	command_line	/usr/lib/nagios/plugins/check_snmp -H '$HOSTADDRESS$' -C '$ARG1$' -o .1.3.6.1.4.1.2021.2.1.5.'$ARG2$' -w '$ARG3$':'$ARG4$' -c '$ARG5$':'$ARG6$'
 	}
 
 
 # 'snmp_disk' command definition
 define command{
 	command_name	snmp_disk
-	command_line	/usr/lib/nagios/plugins/check_snmp -H $HOSTADDRESS$ -C $ARG1$ -o .1.3.6.1.4.1.2021.9.1.7.$ARG2$,.1.3.6.1.4.1.2021.9.1.9.$ARG2$ -w $ARG3$:,:$ARG4$ -c $ARG5$:,:$ARG6$ -u 'kB free (','% used)' -l 'disk space'
+	command_line	/usr/lib/nagios/plugins/check_snmp -H '$HOSTADDRESS$' -C '$ARG1$' -o .1.3.6.1.4.1.2021.9.1.7.'$ARG2$',.1.3.6.1.4.1.2021.9.1.9.'$ARG2$' -w '$ARG3$':,:'$ARG4$' -c '$ARG5$':,:'$ARG6$' -u 'kB free (','% used)' -l 'disk space'
 	}
 
 
 # 'snmp_mem' command definition
 define command{
 	command_name	snmp_mem
-	command_line	/usr/lib/nagios/plugins/check_snmp -H $HOSTADDRESS$ -C $ARG1$ -o .1.3.6.1.4.1.2021.4.6.0,.1.3.6.1.4.1.2021.4.5.0 -w $ARG2$: -c $ARG3$:
+	command_line	/usr/lib/nagios/plugins/check_snmp -H '$HOSTADDRESS$' -C '$ARG1$' -o .1.3.6.1.4.1.2021.4.6.0,.1.3.6.1.4.1.2021.4.5.0 -w '$ARG2$': -c '$ARG3$':
 	}
 
 
 # 'snmp_swap' command definition
 define command{
 	command_name	snmp_swap
-	command_line	/usr/lib/nagios/plugins/check_snmp -H $HOSTADDRESS$ -C $ARG1$ -o .1.3.6.1.4.1.2021.4.4.0,.1.3.6.1.4.1.2021.4.3.0 -w $ARG2$: -c $ARG3$:
+	command_line	/usr/lib/nagios/plugins/check_snmp -H '$HOSTADDRESS$' -C '$ARG1$' -o .1.3.6.1.4.1.2021.4.4.0,.1.3.6.1.4.1.2021.4.3.0 -w '$ARG2$': -c '$ARG3$':
 	}
 
 
 # 'snmp_procs' command definition
 define command{
 	command_name	snmp_procs
-	command_line	/usr/lib/nagios/plugins/check_snmp -H $HOSTADDRESS$ -C $ARG1$ -o host.hrSystem.hrSystemProcesses -w :$ARG2$ -c :$ARG3$ -l processes
+	command_line	/usr/lib/nagios/plugins/check_snmp -H '$HOSTADDRESS$' -C '$ARG1$' -o host.hrSystem.hrSystemProcesses -w :'$ARG2$' -c :'$ARG3$' -l processes
 	}
 
 
 # 'snmp_users' command definition
 define command{
 	command_name	snmp_users
-	command_line	/usr/lib/nagios/plugins/check_snmp -H $HOSTADDRESS$ -C $ARG1$ -o host.hrSystem.hrSystemNumUsers -w :$ARG2$ -c :$ARG3$ -l users
+	command_line	/usr/lib/nagios/plugins/check_snmp -H '$HOSTADDRESS$' -C '$ARG1$' -o host.hrSystem.hrSystemNumUsers -w :'$ARG2$' -c :'$ARG3$' -l users
 	}
 
 
 # 'snmp_mem2' command definition
 define command{
 	command_name	snmp_mem2
-	command_line	/usr/lib/nagios/plugins/check_snmp -H $HOSTADDRESS$ -C $ARG1$ -o host.hrStorage.hrStorageTable.hrStorageEntry.hrStorageUsed.$ARG2$,host.hrStorage.hrStorageTable.hrStorageEntry.hrStorageSize.$ARG2$ -w $ARG3$ -c $ARG4$
+	command_line	/usr/lib/nagios/plugins/check_snmp -H '$HOSTADDRESS$' -C '$ARG1$' -o host.hrStorage.hrStorageTable.hrStorageEntry.hrStorageUsed.'$ARG2$',host.hrStorage.hrStorageTable.hrStorageEntry.hrStorageSize.'$ARG2$' -w '$ARG3$' -c '$ARG4$'
 	}
 
 
 # 'snmp_swap2' command definition
 define command{
 	command_name	snmp_swap2
-	command_line	/usr/lib/nagios/plugins/check_snmp -H $HOSTADDRESS$ -C $ARG1$ -o host.hrStorage.hrStorageTable.hrStorageEntry.hrStorageUsed.$ARG2$,host.hrStorage.hrStorageTable.hrStorageEntry.hrStorageSize.$ARG2$ -w $ARG3$ -c $ARG4$
+	command_line	/usr/lib/nagios/plugins/check_snmp -H '$HOSTADDRESS$' -C '$ARG1$' -o host.hrStorage.hrStorageTable.hrStorageEntry.hrStorageUsed.'$ARG2$',host.hrStorage.hrStorageTable.hrStorageEntry.hrStorageSize.'$ARG2$' -w '$ARG3$' -c '$ARG4$'
 	}
 
 
 # 'snmp_mem3' command definition
 define command{
 	command_name	snmp_mem3
-	command_line	/usr/lib/nagios/plugins/check_snmp -H $HOSTADDRESS$ -C $ARG1$ -o host.hrStorage.hrStorageTable.hrStorageEntry.hrStorageUsed.$ARG2$,host.hrStorage.hrStorageTable.hrStorageEntry.hrStorageSize.$ARG2$ -w $ARG3$ -c $ARG4$
+	command_line	/usr/lib/nagios/plugins/check_snmp -H '$HOSTADDRESS$' -C '$ARG1$' -o host.hrStorage.hrStorageTable.hrStorageEntry.hrStorageUsed.'$ARG2$',host.hrStorage.hrStorageTable.hrStorageEntry.hrStorageSize.'$ARG2$' -w '$ARG3$' -c '$ARG4$'
 	}
 
 
 # 'snmp_swap3' command definition
 define command{
 	command_name	snmp_swap3
-	command_line	/usr/lib/nagios/plugins/check_snmp -H $HOSTADDRESS$ -C $ARG1$ -o host.hrStorage.hrStorageTable.hrStorageEntry.hrStorageUsed.$ARG2$,host.hrStorage.hrStorageTable.hrStorageEntry.hrStorageSize.$ARG2$ -w $ARG3$ -c $ARG4$
+	command_line	/usr/lib/nagios/plugins/check_snmp -H '$HOSTADDRESS$' -C '$ARG1$' -o host.hrStorage.hrStorageTable.hrStorageEntry.hrStorageUsed.'$ARG2$',host.hrStorage.hrStorageTable.hrStorageEntry.hrStorageSize.'$ARG2$' -w '$ARG3$' -c '$ARG4$'
 	}
 
 
 # 'snmp_disk2' command definition
 define command{
 	command_name	snmp_disk2
-	command_line	/usr/lib/nagios/plugins/check_snmp -H $HOSTADDRESS$ -C $ARG1$ -o host.hrStorage.hrStorageTable.hrStorageEntry.hrStorageUsed.$ARG2$ -w $ARG3$ -c $ARG4$ 
+	command_line	/usr/lib/nagios/plugins/check_snmp -H '$HOSTADDRESS$' -C '$ARG1$' -o host.hrStorage.hrStorageTable.hrStorageEntry.hrStorageUsed.'$ARG2$' -w '$ARG3$' -c '$ARG4$'
 	}
 
 
 # 'snmp_tcpopen' command definition
 define command{
 	command_name	snmp_tcpopen
-	command_line	/usr/lib/nagios/plugins/check_snmp -H $HOSTADDRESS$ -C $ARG1$ -o tcp.tcpCurrEstab.0 -w $ARG2$ -c $ARG3$
+	command_line	/usr/lib/nagios/plugins/check_snmp -H '$HOSTADDRESS$' -C '$ARG1$' -o tcp.tcpCurrEstab.0 -w '$ARG2$' -c '$ARG3$'
 	}
 
 
 # 'snmp_tcpstats' command definition
 define command{
 	command_name	snmp_tcpstats
-	command_line	/usr/lib/nagios/plugins/check_snmp -H $HOSTADDRESS$ -C $ARG1$ -o tcp.tcpActiveOpens.0,tcp.tcpPassiveOpens.0,tcp.tcpInSegs.0,tcp.tcpOutSegs.0,tcp.tcpRetransSegs.0 -l 'TCP stats'
+	command_line	/usr/lib/nagios/plugins/check_snmp -H '$HOSTADDRESS$' -C '$ARG1$' -o tcp.tcpActiveOpens.0,tcp.tcpPassiveOpens.0,tcp.tcpInSegs.0,tcp.tcpOutSegs.0,tcp.tcpRetransSegs.0 -l 'TCP stats'
 	}
 
 
 # 'check_snmp_bgpstate' command definition
 define command{
 	command_name	check_snmp_bgpstate
-	command_line	/usr/lib/nagios/plugins/check_bgpstate $HOSTADDRESS$ -c $ARG1$
+	command_line	/usr/lib/nagios/plugins/check_bgpstate '$HOSTADDRESS$' -c '$ARG1$'
 	}
 
 
 # 'check_netapp_uptime' command definition
 define command{
 	command_name	check_netapp_uptime
-	command_line	/usr/lib/nagios/plugins/check_snmp -H $HOSTADDRESS$ -C $ARG1$ -o .1.3.6.1.2.1.1.3.0 --delimiter=')' -l "Uptime is"
+	command_line	/usr/lib/nagios/plugins/check_snmp -H '$HOSTADDRESS$' -C '$ARG1$' -o .1.3.6.1.2.1.1.3.0 --delimiter=')' -l "Uptime is"
 	}
 
 
 # 'check_netapp_cpuload' command definition
 define command{
 	command_name	check_netapp_cpuload
-	command_line	/usr/lib/nagios/plugins/check_snmp -H $HOSTADDRESS$ -C $ARG1$ -o .1.3.6.1.4.1.789.1.2.1.3.0 -w 90 -c 95 -u '%' -l "CPU LOAD " 
+	command_line	/usr/lib/nagios/plugins/check_snmp -H '$HOSTADDRESS$' -C '$ARG1$' -o .1.3.6.1.4.1.789.1.2.1.3.0 -w 90 -c 95 -u '%' -l "CPU LOAD "
 	}
 
 
 # 'check_netapp_numdisks' command definition
 define command{
 	command_name	check_netapp_numdisks
-	command_line	/usr/lib/nagios/plugins/check_snmp -H $HOSTADDRESS$ -C $ARG1$ -o .1.3.6.1.4.1.789.1.6.4.1.0,.1.3.6.1.4.1.789.1.6.4.2.0,.1.3.6.1.4.1.789.1.6.4.8.0,.1.3.6.1.4.1.789.1.6.4.7.0 -u 'Total Disks','Active','Spare','Failed' -l ""
+	command_line	/usr/lib/nagios/plugins/check_snmp -H '$HOSTADDRESS$' -C '$ARG1$' -o .1.3.6.1.4.1.789.1.6.4.1.0,.1.3.6.1.4.1.789.1.6.4.2.0,.1.3.6.1.4.1.789.1.6.4.8.0,.1.3.6.1.4.1.789.1.6.4.7.0 -u 'Total Disks','Active','Spare','Failed' -l ""
 	}
 
 
 # 'check_compaq_thermalCondition' command definition
 define command{
 	command_name	check_compaq_thermalCondition
-	command_line	 /usr/lib/nagios/plugins/check_snmp -H $HOSTADDRESS$ -C $ARG1$ -o .1.3.6.1.4.1.232.6.2.1.0,.1.3.6.1.4.1.232.6.2.2.0,.1.3.6.1.4.1.232.6.2.3.0,.1.3.6.1.4.1.232.6.2.4.0 -u 'ThermalCondition','ThermalTemp','ThermalSystem','ThermalCPUFan' -w 2:2,2:2,2:2,2:2 -c 1:2,1:2,1:2,1:2 -l "Thermal status "
+	command_line	 /usr/lib/nagios/plugins/check_snmp -H '$HOSTADDRESS$' -C '$ARG1$' -o .1.3.6.1.4.1.232.6.2.1.0,.1.3.6.1.4.1.232.6.2.2.0,.1.3.6.1.4.1.232.6.2.3.0,.1.3.6.1.4.1.232.6.2.4.0 -u 'ThermalCondition','ThermalTemp','ThermalSystem','ThermalCPUFan' -w 2:2,2:2,2:2,2:2 -c 1:2,1:2,1:2,1:2 -l "Thermal status "
 	}
 
diff --git a/debian/pluginconfig/ssh.cfg b/debian/pluginconfig/ssh.cfg
index 9f599d9..3a75905 100644
--- a/debian/pluginconfig/ssh.cfg
+++ b/debian/pluginconfig/ssh.cfg
@@ -1,13 +1,13 @@
 # 'check_ssh' command definition
 define command{
 	command_name	check_ssh
-	command_line	/usr/lib/nagios/plugins/check_ssh $HOSTADDRESS$
+	command_line	/usr/lib/nagios/plugins/check_ssh '$HOSTADDRESS$'
 	}
 
 # 'check_ssh_port' command definition
 define command{
 	command_name    check_ssh_port
-	command_line    /usr/lib/nagios/plugins/check_ssh -p $ARG1$ $HOSTADDRESS$
+	command_line    /usr/lib/nagios/plugins/check_ssh -p '$ARG1$' '$HOSTADDRESS$'
 	}
 
 ####
@@ -17,11 +17,11 @@ define command{
 # 'check_ssh_4' command definition
 define command{
         command_name    check_ssh_4
-        command_line    /usr/lib/nagios/plugins/check_ssh $HOSTADDRESS$ -4
+        command_line    /usr/lib/nagios/plugins/check_ssh '$HOSTADDRESS$' -4
         }
 
 # 'check_ssh_port_4' command definition
 define command{
 	command_name    check_ssh_port_4
-	command_line    /usr/lib/nagios/plugins/check_ssh -4 -p $ARG1$ $HOSTADDRESS$
+	command_line    /usr/lib/nagios/plugins/check_ssh -4 -p '$ARG1$' '$HOSTADDRESS$'
 	}
diff --git a/debian/pluginconfig/tcp_udp.cfg b/debian/pluginconfig/tcp_udp.cfg
index 0aa8731..5ccd1c2 100644
--- a/debian/pluginconfig/tcp_udp.cfg
+++ b/debian/pluginconfig/tcp_udp.cfg
@@ -1,13 +1,13 @@
 # 'check_tcp' command definition
 define command{
 	command_name	check_tcp
-	command_line	/usr/lib/nagios/plugins/check_tcp -H $HOSTADDRESS$ -p $ARG1$
+	command_line	/usr/lib/nagios/plugins/check_tcp -H '$HOSTADDRESS$' -p '$ARG1$'
 	}
 
 # 'check_udp' command definition
 define command{
 	command_name	check_udp
-	command_line	/usr/lib/nagios/plugins/check_udp -H $HOSTADDRESS$ -p $ARG1$
+	command_line	/usr/lib/nagios/plugins/check_udp -H '$HOSTADDRESS$' -p '$ARG1$'
 	}
 
 ####
@@ -17,11 +17,11 @@ define command{
 # 'check_tcp_4' command definition
 define command{
         command_name    check_tcp_4
-        command_line    /usr/lib/nagios/plugins/check_tcp -H $HOSTADDRESS$ -p $ARG1$ -4
+        command_line    /usr/lib/nagios/plugins/check_tcp -H '$HOSTADDRESS$' -p '$ARG1$' -4
         }
 
 # 'check_udp_4' command definition
 define command{
         command_name    check_udp_4
-        command_line    /usr/lib/nagios/plugins/check_udp -H $HOSTADDRESS$ -p $ARG1$ -4
+        command_line    /usr/lib/nagios/plugins/check_udp -H '$HOSTADDRESS$' -p '$ARG1$' -4
         }
diff --git a/debian/pluginconfig/telnet.cfg b/debian/pluginconfig/telnet.cfg
index 2611368..d6739d6 100644
--- a/debian/pluginconfig/telnet.cfg
+++ b/debian/pluginconfig/telnet.cfg
@@ -1,7 +1,7 @@
 # 'check_telnet' command definition
 define command{
 	command_name	check_telnet
-	command_line	/usr/lib/nagios/plugins/check_tcp -H $HOSTADDRESS$ -p 23
+	command_line	/usr/lib/nagios/plugins/check_tcp -H '$HOSTADDRESS$' -p 23
 	}
 
 ####
@@ -11,5 +11,5 @@ define command{
 # 'check_telnet_4' command definition
 define command{
         command_name    check_telnet_4
-        command_line    /usr/lib/nagios/plugins/check_tcp -H $HOSTADDRESS$ -p 23 -4
+        command_line    /usr/lib/nagios/plugins/check_tcp -H '$HOSTADDRESS$' -p 23 -4
         }
diff --git a/debian/pluginconfig/users.cfg b/debian/pluginconfig/users.cfg
index 7c620da..614a622 100644
--- a/debian/pluginconfig/users.cfg
+++ b/debian/pluginconfig/users.cfg
@@ -1,6 +1,6 @@
 # 'check_users' command definition
 define command{
 	command_name	check_users
-	command_line	/usr/lib/nagios/plugins/check_users -w $ARG1$ -c $ARG2$
+	command_line	/usr/lib/nagios/plugins/check_users -w '$ARG1$' -c '$ARG2$'
 	}