diff --git a/pkgs/applications/misc/camlistore/default.nix b/pkgs/applications/misc/camlistore/default.nix
deleted file mode 100644
index d90e8a6dba6..00000000000
--- a/pkgs/applications/misc/camlistore/default.nix
+++ /dev/null
@@ -1,35 +0,0 @@
-{ stdenv, lib, go, fetchgit, git, buildGoPackage }:
-
-buildGoPackage rec {
-  name = "camlistore-${version}";
-  version = "0.9";
-
-  src = fetchgit {
-    url = "https://github.com/camlistore/camlistore";
-    rev = "refs/tags/${version}";
-    sha256 = "1ypplr939ny9drsdngapa029fgak0wic8sbna588m79cbl17psya";
-    leaveDotGit = true;
-  };
-
-  buildInputs = [ git ];
-
-  goPackagePath = "";
-  buildPhase = ''
-    cd go/src/camlistore
-    go run make.go
-  '';
-
-  installPhase = ''
-    mkdir -p $bin/bin
-    rm bin/README
-    cp bin/* $bin/bin
-  '';
-
-  meta = with stdenv.lib; {
-    description = "A way of storing, syncing, sharing, modelling and backing up content";
-    homepage = https://camlistore.org;
-    license = licenses.asl20;
-    maintainers = with maintainers; [ cstrahan ];
-    platforms = platforms.unix;
-  };
-}
diff --git a/pkgs/applications/misc/perkeep/default.nix b/pkgs/applications/misc/perkeep/default.nix
new file mode 100644
index 00000000000..3b64cf4aa6c
--- /dev/null
+++ b/pkgs/applications/misc/perkeep/default.nix
@@ -0,0 +1,31 @@
+{ stdenv, lib, go_1_8, fetchzip, git }:
+
+stdenv.mkDerivation rec {
+  name = "perkeep-${version}";
+  version = "20170505";
+
+  src = fetchzip {
+    url = "https://perkeep.org/dl/monthly/camlistore-${version}-src.zip";
+    sha256 = "1vliyvkyzmhdi6knbh8rdsswmz3h0rpxdpq037jwbdbkjccxjdwa";
+  };
+
+  buildInputs = [ git go_1_8 ];
+
+  goPackagePath = "";
+  buildPhase = ''
+    go run make.go
+  '';
+
+  installPhase = ''
+    mkdir -p $out/bin
+    cp bin/* $out/bin
+  '';
+
+  meta = with stdenv.lib; {
+    description = "A way of storing, syncing, sharing, modelling and backing up content (née Camlistore)";
+    homepage = https://perkeep.org;
+    license = licenses.asl20;
+    maintainers = with maintainers; [ cstrahan ];
+    platforms = platforms.unix;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 9143a756c44..dfc55ce4137 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -14122,7 +14122,7 @@ with pkgs;
     openjpeg = openjpeg_1;
   };
 
-  camlistore = callPackage ../applications/misc/camlistore { };
+  perkeep = callPackage ../applications/misc/perkeep { };
 
   canto-curses = callPackage ../applications/networking/feedreaders/canto-curses { };