diff --git a/files/gdmflexiserver-fake.sh b/files/gdmflexiserver-fake.sh
new file mode 100644
index 0000000..f638861
--- /dev/null
+++ b/files/gdmflexiserver-fake.sh
@@ -0,0 +1,2 @@
+#!/bin/sh
+/usr/bin/dm-tool switch-to-greeter
diff --git a/tasks/light-locker-settings.yaml b/tasks/light-locker-settings.yaml
deleted file mode 100644
index 18f9a95..0000000
--- a/tasks/light-locker-settings.yaml
+++ /dev/null
@@ -1,38 +0,0 @@
----
-- name: light-locker-settings dependencies
-  apt:
-    pkg:
-      - gettext
-      - intltool
-      - python3-psutil
-      - build-essential
-
-- name: download light-locker-settings
-  get_url:
-    url: https://github.com/Antergos/light-locker-settings/archive/1.5.3.tar.gz
-    dest: /opt/light-locker-settings-1.5.3.tar.bz2
-    checksum: sha256:9174ee896d9ea7f41cb14eed61bea473de4b57278858bbd32045f1ed64858fcd
-
-- name: unpack light-locker-settings
-  unarchive:
-    src: /opt/light-locker-settings-1.5.3.tar.bz2
-    remote_src: yes
-    dest: /opt
-
-- name: configure script for light-locker-settings
-  command: ./configure --prefix=/usr --python=python3
-  args:
-    chdir: /opt/light-locker-settings-1.5.3
-    creates: /usr/local/bin/light-locker-settings
-
-- name: make light-locker-settings
-  command: make
-  args:
-    chdir: /opt/light-locker-settings-1.5.3
-    creates: /usr/local/bin/light-locker-settings
-
-- name: install light-locker-settings
-  command: make install
-  args:
-    chdir: /opt/light-locker-settings-1.5.3
-    creates: /usr/local/bin/light-locker-settings
diff --git a/tasks/screensaver.yaml b/tasks/screensaver.yaml
new file mode 100644
index 0000000..6d1f4f6
--- /dev/null
+++ b/tasks/screensaver.yaml
@@ -0,0 +1,34 @@
+---
+
+- 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
+  file:
+    src: gdmflexiserver-fake.sh
+    dest: /usr/local/bin/gdmflexiserver
+    mode: 0755
diff --git a/tasks/xfce.yaml b/tasks/xfce.yaml
index 09cbb0c..fd86463 100644
--- a/tasks/xfce.yaml
+++ b/tasks/xfce.yaml
@@ -49,5 +49,3 @@
   template:
     src: xfwm4.xml.j2
     dest: /etc/xdg/xfce4/xfconf/xfce-perchannel-xml/xfwm4.xml
-
-- import_tasks: light-locker-settings.yaml
diff --git a/templates/Xresources.xscreensaver.j2 b/templates/Xresources.xscreensaver.j2
new file mode 100644
index 0000000..f1b1229
--- /dev/null
+++ b/templates/Xresources.xscreensaver.j2
@@ -0,0 +1,24 @@
+xscreensaver.mode: blank
+
+xscreensaver.timeout: 0:15:00
+xscreensaver.lockTimeout: 0:15:00
+xscreensaver.passwdTimeout: 0:00:30
+
+xscreensaver.dpmsQuickoffEnabled: True
+
+xscreensaver.grabDesktopImages: False
+xscreensaver.grabVideoFrames: False
+xscreensaver.chooseRandomImages: True
+
+xscreensaver.lock: True
+
+xscreensaver.fade: True
+xscreensaver.unfade: False
+xscreensaver.fadeSeconds: 0:00:03
+
+xscreensaver.splash: False
+
+xscreensaver.passwd.heading.label: XScreenSaver
+xscreensaver.passwd.body.label: Dieser Bildschirm ist gesperrt.
+xscreensaver.passwd.unlock.label: OK
+xscreensaver.passwd.login.label: Benutzer wechseln