diff --git a/puppet/dist/etc/hosts b/puppet/dist/etc/hosts
new file mode 100644
index 0000000000000000000000000000000000000000..029054127caec22db0455fa193898e019fc41c23
--- /dev/null
+++ b/puppet/dist/etc/hosts
@@ -0,0 +1,9 @@
+127.0.0.1	localhost
+
+# The following lines are desirable for IPv6 capable hosts
+::1     ip6-localhost ip6-loopback
+fe00::0 ip6-localnet
+ff00::0 ip6-mcastprefix
+ff02::1 ip6-allnodes
+ff02::2 ip6-allrouters
+ff02::3 ip6-allhosts
diff --git a/puppet/dist/host/stentyst/etc/default/slimserver b/puppet/dist/host/stentyst/etc/default/slimserver
new file mode 100644
index 0000000000000000000000000000000000000000..262bebd7fa39917a808241ec5412f7a0ea830757
--- /dev/null
+++ b/puppet/dist/host/stentyst/etc/default/slimserver
@@ -0,0 +1,25 @@
+# Set this to zero to disable slimserver startup.
+START=1
+
+# This limits http access to the local host.
+# Comment it out for network-wide access, or change 
+# to enable a single interface.
+HTTP_ADDR=stentyst.cederqvist
+
+# Change this to set a different port for http access. Note
+# that setting this here will over-ride any change made in the web interface.
+#HTTP_PORT=9000
+
+# Comment out this line to enable cli access on the default port (9090)
+# or change it for a non-standard port. Note
+# that setting this here will over-ride any change made in the web interface.
+#CLI_PORT=0
+
+# Change this to allow network-wide access to the CLI interface.
+CLI_ADDR=127.0.0.1
+
+# To run slimserver as a particular group (for mp3 access) change this.
+#GROUP="somegroup"
+
+# Add any other parameters here.
+PARAMS="--audiodir /music"
diff --git a/puppet/master/manifests/site.pp b/puppet/master/manifests/site.pp
index d68f258bb1aceee1ea3038dbdc046889933e8706..dbe2f002eb1954de15b43c968f8e04cf7a8fe63f 100644
--- a/puppet/master/manifests/site.pp
+++ b/puppet/master/manifests/site.pp
@@ -138,4 +138,36 @@ node stentyst {
     ensure    => running,
     enable    => true,
   }
+
+  package { "slimserver":
+    ensure => latest,
+    notify => Service["slimserver"],
+  }
+
+  package { ["lame", "lame-extras"]:
+    ensure => latest,
+    notify => Service["slimserver"],
+  }
+
+  file { "/etc/default/slimserver":
+    source => "puppet:///host/etc/default/slimserver",
+    owner => root,
+    group => root,
+    mode => 444,
+    notify => Service["slimserver"],
+  }
+
+  file { "/etc/hosts":
+    source => "puppet:///dist/etc/hosts",
+    owner => root,
+    group => root,
+    mode => 444,
+    notify => Service["slimserver"],
+  }
+
+  service { "slimserver":
+    ensure    => running,
+    enable    => true,
+    require   => Mount["/music"],
+  }
 }