diff --git a/files/lysator.conf b/files/lysator.conf
new file mode 100644
index 0000000000000000000000000000000000000000..a375ff2a0ba493e779c7cdd77af470d60f4cba17
--- /dev/null
+++ b/files/lysator.conf
@@ -0,0 +1,2 @@
+# Denna fil hanteras av puppet i förrådet lyslogclient.
+*.*	@loghost.lysator.liu.se
diff --git a/files/rsyslogd.conf b/files/rsyslogd.conf
deleted file mode 100644
index 8750fdbe13fa2d53b88fe6e99e2644991d0b441a..0000000000000000000000000000000000000000
--- a/files/rsyslogd.conf
+++ /dev/null
@@ -1,125 +0,0 @@
-#  /etc/rsyslog.conf	Configuration file for rsyslog.
-#
-#			For more information see
-#			/usr/share/doc/rsyslog-doc/html/rsyslog_conf.html
-#
-#  Default logging rules can be found in /etc/rsyslog.d/50-default.conf
-#  These are currently not loaded
-
-
-#################
-#### MODULES ####
-#################
-
-$ModLoad imuxsock # provides support for local system logging
-$ModLoad imklog   # provides kernel logging support (previously done by rklogd)
-#$ModLoad immark  # provides --MARK-- message capability
-
-# provides UDP syslog reception
-#$ModLoad imudp
-#$UDPServerRun 514
-
-# provides TCP syslog reception
-#$ModLoad imtcp
-#$InputTCPServerRun 514
-
-
-###########################
-#### GLOBAL DIRECTIVES ####
-###########################
-
-#
-# Use traditional timestamp format.
-# To enable high precision timestamps, comment out the following line.
-#
-$ActionFileDefaultTemplate RSYSLOG_TraditionalFileFormat
-
-#
-# Set the default permissions for all log files.
-#
-$FileOwner root
-$FileGroup adm
-$FileCreateMode 0640
-$DirCreateMode 0755
-
-#
-# Where to place spool and state files
-#
-$WorkDirectory /var/spool/rsyslog
-
-#
-# Include all config files in /etc/rsyslog.d/
-#
-$IncludeConfig /etc/rsyslog.d/*.conf
-
-
-###############
-#### RULES ####
-###############
-
-#
-# First some standard log files.  Log by facility.
-#
-auth,authpriv.*			/var/log/auth.log
-*.*;auth,authpriv.none		-/var/log/syslog
-#cron.*				/var/log/cron.log
-daemon.*			-/var/log/daemon.log
-kern.*				-/var/log/kern.log
-lpr.*				-/var/log/lpr.log
-mail.*				-/var/log/mail.log
-user.*				-/var/log/user.log
-
-#
-# Logging for the mail system.  Split it up so that
-# it is easy to write scripts to parse these files.
-#
-mail.info			-/var/log/mail.info
-mail.warn			-/var/log/mail.warn
-mail.err			/var/log/mail.err
-
-#
-# Logging for INN news system.
-#
-news.crit			/var/log/news/news.crit
-news.err			/var/log/news/news.err
-news.notice			-/var/log/news/news.notice
-
-#
-# Some "catch-all" log files.
-#
-*.=debug;\
-	auth,authpriv.none;\
-	news.none;mail.none	-/var/log/debug
-*.=info;*.=notice;*.=warn;\
-	auth,authpriv.none;\
-	cron,daemon.none;\
-	mail,news.none		-/var/log/messages
-
-#
-# Emergencies are sent to everybody logged in.
-#
-*.emerg				*
-
-#
-# I like to have messages displayed on the console, but only on a virtual
-# console I usually leave idle.
-#
-#daemon,mail.*;\
-#	news.=crit;news.=err;news.=notice;\
-#	*.=debug;*.=info;\
-#	*.=notice;*.=warn	/dev/tty8
-
-# The named pipe /dev/xconsole is for the `xconsole' utility.  To use it,
-# you must invoke `xconsole' with the `-file' option:
-# 
-#    $ xconsole -file /dev/xconsole [...]
-#
-# NOTE: adjust the list below, or you'll go crazy if you have a reasonably
-#      busy site..
-#
-daemon.*;mail.*;\
-	news.err;\
-	*.=debug;*.=info;\
-	*.=notice;*.=warn	|/dev/xconsole
-
-*.*	@loghost.lysator.liu.se
diff --git a/manifests/init.pp b/manifests/init.pp
index 3d730beac1d5699f7343fca5629f2851e28d9342..f3d512f8714c425c27a3613b9b99e27ac64d90e5 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -1,12 +1,12 @@
 class lyslogclient
 {
   file {
-    '/etc/rsyslog.conf':
+    '/etc/rsyslog.d/lysator.conf':
       ensure => file,
       owner  => 'root',
       group  => 'root',
       mode   => '0644',
-      source => 'puppet:///modules/lyslogclient/rsyslogd.conf';
+      source => 'puppet:///modules/lyslogclient/lysator.conf';
   }
 
   ensure_packages(['rsyslog'],