diff --git a/net/samba/files/samba.init b/net/samba/files/samba.init
index 504ce8a60..00c7da7fd 100644
--- a/net/samba/files/samba.init
+++ b/net/samba/files/samba.init
@@ -6,8 +6,26 @@ RUN_D=/var/run/samba
 NMBD_PID_F=$RUN_D/nmbd.pid
 SMBD_PID_F=$RUN_D/smbd.pid
 
+. /etc/functions.sh
+
+config_cb() {
+        local cfg="$CONFIG_SECTION"
+        local cfgtype
+        config_get cfgtype "$cfg" TYPE
+
+        case "$cfgtype" in
+                timezone)
+                        config_get posixtz      $cfg posixtz
+                        config_get zoneinfo     $cfg zoneinfo
+                	echo "$posixtz" > /etc/TZ
+                ;;
+        esac
+}
+
+
 start() {
 	[ -f $DEFAULT ] && . $DEFAULT
+	config_load timezone&
 	mkdir -p $RUN_D
 	nmbd -D $NMBD_OPTIONS
 	smbd -D $SMBD_OPTIONS
diff --git a/net/samba/files/smbd.config b/net/samba/files/smbd.config
new file mode 100644
index 000000000..6993b8eba
--- /dev/null
+++ b/net/samba/files/smbd.config
@@ -0,0 +1,3 @@
+# use a random selection of 8 public stratum 2 servers
+# see http://twiki.ntp.org/bin/view/Servers/NTPPoolServers
+servers pool.ntp.org