diff --git a/pkgs/applications/graphics/xscreensaver/5.04.nix b/pkgs/applications/graphics/xscreensaver/5.04.nix
deleted file mode 100644
index e3b38cfe3f8..00000000000
--- a/pkgs/applications/graphics/xscreensaver/5.04.nix
+++ /dev/null
@@ -1,40 +0,0 @@
-args : with args; let localDefs = builderDefs (args // {
-		src = /* put a fetchurl here */
-		fetchurl {
-			url = http://www.jwz.org/xscreensaver/xscreensaver-5.04.tar.gz;
-			sha256 = "1mx6zc6rvb6pr9wb6mv4ljiii9ybw0dshd74aclf7rlmfx4hn86i";
-		};
-		useConfig = true;
-		reqsList = [
-			["true" "libX11" "gtk" "pkgconfig" "bc" "perl" "intltool" "libXmu"]
-			["GL" "mesa"]
-			["GUI" "gtk" "libxml2" "libglade"]
-			["jpeg" "libjpeg"]
-			["false"]
-		];
-		configFlags = [
-			"GL" " --with-gl "
-			"gdkpixbuf" " --with-pixbuf "
-			"DPMS" " --with-dpms "
-			"true" (" --with-x-app-defaults=\$out/share/xscreensaver/app-defaults "+
-				" --with-hackdir=\$out/share/xscreensaver-hacks ")
-		];
-	}) null; /* null is a terminator for sumArgs */
-	in with localDefs;
-let 
-	preConfigure = FullDepEntry ("
-		sed -e 's%@GTK_DATADIR@%@datadir@% ; s%@PO_DATADIR@%@datadir@%' "+
-		"-i driver/Makefile.in po/Makefile.in.in;
-	") [minInit doUnpack];
-in
-stdenv.mkDerivation rec {
-	name = "xscreensaver-"+version;
-	builder = writeScript (name + "-builder")
-		(textClosure localDefs [preConfigure doConfigure doMakeInstall doForceShare doPropagate]);
-	meta = {
-		description = "
-	The X screensaver daemon. Run xscreensaver-demo to configure.
-";
-		inherit src;
-	};
-}
diff --git a/pkgs/applications/graphics/xscreensaver/5.05.nix b/pkgs/applications/graphics/xscreensaver/default.nix
similarity index 83%
rename from pkgs/applications/graphics/xscreensaver/5.05.nix
rename to pkgs/applications/graphics/xscreensaver/default.nix
index 2410f693877..ef8ac8ae3d7 100644
--- a/pkgs/applications/graphics/xscreensaver/5.05.nix
+++ b/pkgs/applications/graphics/xscreensaver/default.nix
@@ -1,8 +1,9 @@
 args : with args; let localDefs = builderDefs.meta.function (args // {
+                version = lib.getAttr ["version"] args "5.07";
 		src = /* put a fetchurl here */
 		fetchurl {
-		    url = http://www.jwz.org/xscreensaver/xscreensaver-5.05.tar.gz;
-		    sha256 = "06l2vibjddszwpb9lflgflf0pn6rwpf609j2vdry3swh35pkcr1w";
+		    url = "http://www.jwz.org/xscreensaver/xscreensaver-${version}.tar.gz";
+		    sha256 = "1dmd9gwwqr4rnhxl71x1wn8j3xgijbpf6ydx42xzrzxi0x6afl4c";
 		};
 		useConfig = true;
 		reqsList = [
@@ -38,3 +39,4 @@ stdenv.mkDerivation rec {
 		inherit src;
 	};
 }
+