diff --git a/pkgs/applications/version-management/cvs/default.nix b/pkgs/applications/version-management/cvs/default.nix
new file mode 100644
index 00000000000..34d44e87d30
--- /dev/null
+++ b/pkgs/applications/version-management/cvs/default.nix
@@ -0,0 +1,11 @@
+{stdenv, fetchurl, vim}:
+
+stdenv.mkDerivation {
+  name = "cvs-1.12.13";
+
+  src = fetchurl {
+    url = ftp://ftp.nluug.nl/pub/gnu/non-gnu/cvs/cvs-1.12.13.tar.bz2;
+    md5 = "956ab476ce276c2d19d583e227dbdbea";
+  };
+  buildInputs = [vim];
+}
diff --git a/pkgs/system/all-packages-generic.nix b/pkgs/system/all-packages-generic.nix
index b12da2aaef4..446c2f2732a 100644
--- a/pkgs/system/all-packages-generic.nix
+++ b/pkgs/system/all-packages-generic.nix
@@ -1361,6 +1361,10 @@ rec {
 
   ### APPLICATIONS
 
+  cvs = (import ../applications/version-management/cvs) {
+    inherit fetchurl stdenv vim;
+  };
+
   subversion11x = (import ../applications/version-management/subversion-1.1.x) {
     inherit fetchurl stdenv openssl db4 expat swig zlib;
     localServer = true;