diff --git a/tasks/main.yaml b/tasks/main.yaml
index 880ccf6..6e3c361 100644
--- a/tasks/main.yaml
+++ b/tasks/main.yaml
@@ -21,7 +21,8 @@
 - import_tasks: clean.yaml
 
 - import_tasks: xfce.yaml
-- import_tasks: screensaver.yaml
+- import_role:
+    name: screensaver
 - import_tasks: backgrounds.yaml
 - import_tasks: fonts.yaml
 
diff --git a/tasks/screensaver.yaml b/tasks/screensaver.yaml
deleted file mode 100644
index 469e142..0000000
--- a/tasks/screensaver.yaml
+++ /dev/null
@@ -1,34 +0,0 @@
----
-
-- name: ensure old screensavers are absent
-  apt:
-    pkg:
-      - light-locker
-    state: absent
-
-- name: uninstall light-locker-settings
-  file:
-    path: "{{ item }}"
-    state: absent
-  with_items:
-    - /usr/bin/light-locker-settings
-    - /usr/share/applications/light-locker-settings.desktop
-    - /usr/share/light-locker-settings
-    - /usr/share/doc/light-locker-settings
-    - /opt/light-locker-settings-1.5.3
-    - /opt/light-locker-settings-1.5.3.tar.bz2
-
-- name: install xscreensaver
-  apt:
-    pkg: xscreensaver
-
-- name: xscreensaver default settings
-  template:
-    src: Xresources.xscreensaver.j2
-    dest: /etc/X11/Xresources/xscreensaver
-
-- name: gdmflexiserver dummy script
-  copy:
-    src: gdmflexiserver-fake.sh
-    dest: /usr/local/bin/gdmflexiserver
-    mode: 0755