diff --git a/pkgs/misc/screensavers/xautolock/default.nix b/pkgs/misc/screensavers/xautolock/default.nix
new file mode 100644
index 00000000000..6eece887353
--- /dev/null
+++ b/pkgs/misc/screensavers/xautolock/default.nix
@@ -0,0 +1,16 @@
+{stdenv, fetchurl, x11, imake, libXScrnSaver, scrnsaverproto}:
+
+stdenv.mkDerivation rec
+{
+  name = "xautolock-2.1";
+  src = fetchurl
+  {
+    url = "http://www.ibiblio.org.org/pub/Linux/X11/screensavers/${name}.tgz";
+    sha256 = "1ylc6589ck88jmp8bxccs0xay1nyrnlw6cajzihk5m0pkfwwk92b";
+  };
+
+  makeFlags="BINDIR=$$out/bin MANPATH=$$out/man";
+  preBuild = "xmkmf";
+  installTargets = "install install.man";
+  buildInputs = [x11 imake libXScrnSaver scrnsaverproto];
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index b12ac7fc239..af4cc4d8774 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3438,6 +3438,12 @@ let pkgs = rec {
     inherit (xlibs) libXv libXinerama;
   };
 
+  xautolock = import ../misc/screensavers/xautolock {
+    inherit fetchurl stdenv x11;
+    inherit (xorg) imake;
+    inherit (xlibs) libXScrnSaver scrnsaverproto;
+  };
+
   xlibsWrapper = import ../development/libraries/xlibs-wrapper {
     inherit stdenv;
     packages = [