diff --git a/createlinks b/createlinks
index 573ab65..dd49024 100644
--- a/createlinks
+++ b/createlinks
@@ -7,7 +7,7 @@ foreach my $conf (qw!zabbix_agent.conf zabbix_agentd.conf zabbix_agentd.conf.d/a
                      zabbix_agentd.conf.d/deprecated_cpunum.conf zabbix_agentd.conf.d/deprecated_memory.conf
                      zabbix_agentd.conf.d/deprecated_netstat.conf zabbix_agentd.conf.d/deprecated_swap.conf
                      zabbix_agentd.conf.d/extip.conf zabbix_agentd.conf.d/mail.conf zabbix_agentd.conf.d/mysql.conf
-                     zabbix_agentd.conf.d/phpki_certs.conf!){
+                     zabbix_agentd.conf.d/phpki_certs.conf zabbix_agentd.conf.d/samba.conf!){
     templates2events("/etc/zabbix/$conf", qw(zabbix-agent-update bootstrap-console-save));
 }
 templates2events("/etc/sudoers", "zabbix-agent-update");
diff --git a/root/etc/e-smith/templates/etc/zabbix/zabbix_agentd.conf.d/samba.conf/10nmblookup b/root/etc/e-smith/templates/etc/zabbix/zabbix_agentd.conf.d/samba.conf/10nmblookup
new file mode 100644
index 0000000..db22bee
--- /dev/null
+++ b/root/etc/e-smith/templates/etc/zabbix/zabbix_agentd.conf.d/samba.conf/10nmblookup
@@ -0,0 +1,2 @@
+# Check if nmbd is available and working
+UserParameter=samba.nmbd.status,/var/lib/zabbix/bin/check_nmblookup --server=127.0.0.1 --host={$smb{ServerName};}