diff --git a/pkgs/misc/screensavers/light-locker/default.nix b/pkgs/misc/screensavers/light-locker/default.nix
new file mode 100644
index 000000000000..48b30bccbdd8
--- /dev/null
+++ b/pkgs/misc/screensavers/light-locker/default.nix
@@ -0,0 +1,43 @@
+{ stdenv
+, fetchFromGitHub
+, which
+, xfce
+, glib
+, pkgconfig
+, libX11
+, gtk3
+, dbus_glib
+, systemd
+, wrapGAppsHook
+}:
+
+stdenv.mkDerivation rec {
+  name = "${basename}-${version}";
+  basename = "light-locker";
+  version = "1.7.0";
+
+  src = fetchFromGitHub {
+    owner = "the-cavalry";
+    repo = basename;
+    rev = "v${version}";
+    sha256 = "0ygkp5vgkx2nfhfql6j2jsfay394gda23ir3sx4f72j4agsirjvj";
+  };
+
+  buildInputs = [ which xfce.xfce4_dev_tools glib pkgconfig libX11 gtk3 dbus_glib systemd wrapGAppsHook ];
+
+  preConfigure = ''
+    ./autogen.sh
+  '';
+
+  meta = with stdenv.lib; {
+    homepage = https://github.com/the-cavalry/light-locker;
+    description = "light-locker is a simple locker";
+    longDescription = ''
+      light-locker is a simple locker (forked from gnome-screensaver) that aims to have simple, sane, secure defaults and be well integrated with the desktop while not carrying any desktop-specific dependencies.
+      It relies on lightdm for locking and unlocking your session via ConsoleKit/UPower or logind/systemd.
+    '';
+    license = licenses.gpl2;
+    maintainers = with maintainers; [ obadz ];
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 986004c56422..a530e3fa1c53 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7707,6 +7707,8 @@ let
 
   lightning = callPackage ../development/libraries/lightning { };
 
+  lightlocker = callPackage ../misc/screensavers/light-locker { };
+
   lirc = callPackage ../development/libraries/lirc { };
 
   liquidfun = callPackage ../development/libraries/liquidfun { };