diff --git a/puppet/dist/etc/ntp.conf.server b/puppet/dist/etc/ntp.conf.server
new file mode 100644
index 0000000000000000000000000000000000000000..3aaebc7e2a5d63263f493415f52729370aca05e0
--- /dev/null
+++ b/puppet/dist/etc/ntp.conf.server
@@ -0,0 +1,42 @@
+# /etc/ntp.conf, configuration for ntpd
+
+driftfile /var/lib/ntp/ntp.drift
+
+# Enable this if you want statistics to be logged.
+#statsdir /var/log/ntpstats/
+
+statistics loopstats peerstats clockstats
+filegen loopstats file loopstats type day enable
+filegen peerstats file peerstats type day enable
+filegen clockstats file clockstats type day enable
+
+
+# You do need to talk to an NTP server or two (or three).
+server ntp2.sp.se
+server ntp3.sp.se
+server ntp2.sth.netnod.se
+server ntp2.gbg.netnod.se
+server timehost.lysator.liu.se
+
+# By default, exchange time with everybody, but don't allow configuration.
+# See /usr/share/doc/ntp-doc/html/accopt.html for details.
+restrict -4 default kod notrap nomodify nopeer noquery
+restrict -6 default kod notrap nomodify nopeer noquery
+
+# Local users may interrogate the ntp server more closely.
+restrict 127.0.0.1
+restrict ::1
+
+# Clients from this (example!) subnet have unlimited access,
+# but only if cryptographically authenticated
+#restrict 192.168.123.0  mask  255.255.255.0 notrust
+
+# If you want to provide time to your local subnet, change the next line.
+# (Again, the address is an example only.)
+#broadcast 192.168.123.255
+
+# If you want to listen to time broadcasts on your local subnet,
+# de-comment the next lines. Please do this only if you trust everybody
+# on the network!
+#disable auth
+#broadcastclient
diff --git a/puppet/master/manifests/site.pp b/puppet/master/manifests/site.pp
index dbe2f002eb1954de15b43c968f8e04cf7a8fe63f..dc7bd90496c938399b2cbe73e04c97af16bf67da 100644
--- a/puppet/master/manifests/site.pp
+++ b/puppet/master/manifests/site.pp
@@ -11,12 +11,12 @@ node stentyst {
 
   file { "/etc/network/interfaces":
     source => "puppet:///host/etc/network/interfaces",
-    notify => service[networking],
+    notify => Service[networking],
   }
 
   file { "/etc/dhcp3/dhclient.conf":
     source => "puppet:///host/etc/dhcp3/dhclient.conf",
-    notify => service[networking],
+    notify => Service[networking],
   }
 
   service { networking:
@@ -170,4 +170,23 @@ node stentyst {
     enable    => true,
     require   => Mount["/music"],
   }
+
+  package { ["ntp", "ntp-doc"]:
+    ensure => latest,
+  }
+
+  file { "/etc/ntp.conf":
+    source => "puppet:///dist/etc/ntp.conf.server",
+    owner => root,
+    group => root,
+    mode => 444,
+  }
+    
+  service { ntp:
+    subscribe => [Package["ntp"],
+                  File["/etc/ntp.conf"]],
+    enable    => true,
+    ensure    => running,
+    hasstatus => true,
+  }
 }