--- trunk/samba/nmbd.service	2011/06/03 12:12:48	1345
+++ trunk/samba/nmbd.service	2011/11/07 16:13:15	1547
@@ -1,9 +1,11 @@
 [Unit]
 Description=Samba Netbios nameserver
-After=syslog.target
+After=syslog.target network.target
 
 [Service]
-ExecStart=/usr/sbin/nmbd -F
+Type=forking
+EnvironmentFile=-/etc/conf.d/samba
+ExecStart=/usr/sbin/nmbd $NMBDOPTIONS
 
 [Install]
 WantedBy=multi-user.target