diff --git a/manifests/workstation.pp b/manifests/workstation.pp
index ef483e4a068588ab033ad9e591c3ccd5a602bee6..f3bf53361f60aef9d4f49797f36b07381e3f9fc8 100644
--- a/manifests/workstation.pp
+++ b/manifests/workstation.pp
@@ -195,33 +195,11 @@ class freebsd::workstation inherits freebsd::base {
     mode   => '0644',
   }
 
-  file { '/usr/local/etc/slim.conf':
-    ensure => file,
-    source => 'puppet:///modules/freebsd/workstation/slim.conf',
-    owner  => 'root',
-    group  => 'wheel',
-    mode   => '0644',
-  }
-
-  file { '/usr/local/share/slim-lysator/themes/':
-    ensure  => directory,
-    recurse => true,
-    source  => 'puppet:///modules/freebsd/workstation/slim.themes/',
-    owner   => 'root',
-    group   => 'wheel',
-    mode    => '0644',
-  }
-
   file_line { 'Enable D-Bus':
     path => '/etc/rc.conf',
     line => 'dbus_enable="YES"',
   }
 
-  file_line { 'Enable slim login manager':
-    path => '/etc/rc.conf',
-    line => 'slim_enable="YES"',
-  }
-
   # Set default Xorg keyboard layout to Swedish.
   file { '/usr/local/etc/X11/xorg.conf.d/keyboard.conf':
     ensure => file,
diff --git a/manifests/workstation/slim.pp b/manifests/workstation/slim.pp
new file mode 100644
index 0000000000000000000000000000000000000000..d2bcad024f0fdd79072e2017f188ff736ad2984e
--- /dev/null
+++ b/manifests/workstation/slim.pp
@@ -0,0 +1,24 @@
+#
+class freebsd::workstation::slim {
+  file { '/usr/local/etc/slim.conf':
+    ensure => file,
+    source => 'puppet:///modules/freebsd/workstation/slim.conf',
+    owner  => 'root',
+    group  => 'wheel',
+    mode   => '0644',
+  }
+
+  file { '/usr/local/share/slim-lysator/themes/':
+    ensure  => directory,
+    recurse => true,
+    source  => 'puppet:///modules/freebsd/workstation/slim.themes/',
+    owner   => 'root',
+    group   => 'wheel',
+    mode    => '0644',
+  }
+
+  file_line { 'Enable slim login manager':
+    path => '/etc/rc.conf',
+    line => 'slim_enable="YES"',
+  }
+}