diff --git a/files/resolv.conf b/files/resolv.conf
new file mode 100644
index 0000000000000000000000000000000000000000..1ecd7769ac2af0fdd863d49b37204c64b86bd28a
--- /dev/null
+++ b/files/resolv.conf
@@ -0,0 +1,5 @@
+# This file is managed by Puppet.
+search lysator.liu.se
+nameserver 2001:6b0:17:f0a0::e1
+nameserver 130.236.254.225
+nameserver 130.236.254.4
diff --git a/manifests/dns_config.pp b/manifests/dns_config.pp
new file mode 100644
index 0000000000000000000000000000000000000000..cba0b86b18d97c9a6d34d973187cfb72119e140c
--- /dev/null
+++ b/manifests/dns_config.pp
@@ -0,0 +1,10 @@
+# Class for adding DNS configuration to the system
+class timehost::dns_config {
+  file { '/etc/resolv.conf':
+    ensure => file,
+    source => 'puppet:///modules/timehost/resolv.conf',
+    owner  => 'root',
+    group  => 'root',
+  }
+}
+