diff --git a/nixos/tests/riak.nix b/nixos/tests/riak.nix
index f36d12bdb2cf..18d028232ac2 100644
--- a/nixos/tests/riak.nix
+++ b/nixos/tests/riak.nix
@@ -7,7 +7,7 @@ import ./make-test.nix {
 
       {
         services.riak.enable = true;
-        services.riak.package = pkgs.riak2;
+        services.riak.package = pkgs.riak;
       };
   };
 
diff --git a/pkgs/development/interpreters/erlang/R15.nix b/pkgs/development/interpreters/erlang/R15.nix
deleted file mode 100644
index 137bae6e4616..000000000000
--- a/pkgs/development/interpreters/erlang/R15.nix
+++ /dev/null
@@ -1,69 +0,0 @@
-{ stdenv, fetchurl, perl, gnum4, ncurses, openssl
-, makeWrapper, gnused, gawk
-, wxSupport ? false, mesa ? null, wxGTK ? null, xorg ? null }:
-
-assert wxSupport -> mesa != null && wxGTK != null && xorg != null;
-
-let version = "15B03"; in
-
-stdenv.mkDerivation {
-  name = "erlang-" + version;
-
-  src = fetchurl {
-    url = "http://www.erlang.org/download/otp_src_R15B03-1.tar.gz";
-    sha256 = "4bccac86dd76aec050252e44276a0283a0df9218e6470cf042a9b9f9dfc9476c";
-  };
-
-  buildInputs =
-    [ perl gnum4 ncurses openssl
-      makeWrapper
-    ] ++ stdenv.lib.optional wxSupport [ mesa wxGTK xorg.libX11 ];
-
-  patchPhase = '' sed -i "s@/bin/rm@rm@" lib/odbc/configure erts/configure '';
-
-  preConfigure = ''
-    export HOME=$PWD/../
-    sed -e s@/bin/pwd@pwd@g -i otp_build
-  '';
-
-  configureFlags = "--with-ssl=${openssl}";
-
-  postInstall = let
-    manpages = fetchurl {
-      url = "http://www.erlang.org/download/otp_doc_man_R${version}.tar.gz";
-      sha256 = "0sqamzbd7qyz3klgl9vm1qvl0rhsfd1dx485pb0m2185qvw02nha";
-    };
-  in ''
-    tar xf "${manpages}" -C "$out/lib/erlang"
-    for i in "$out"/lib/erlang/man/man[0-9]/*.[0-9]; do
-      prefix="''${i%/*}"
-      ensureDir "$out/share/man/''${prefix##*/}"
-      ln -s "$i" "$out/share/man/''${prefix##*/}/''${i##*/}erl"
-    done
-  '';
-
-  # Some erlang bin/ scripts run sed and awk
-  postFixup = ''
-    wrapProgram $out/lib/erlang/bin/erl --prefix PATH ":" "${gnused}/bin/"
-    wrapProgram $out/lib/erlang/bin/start_erl --prefix PATH ":" "${gnused}/bin/:${gawk}/bin"
-  '';
-
-  setupHook = ./setup-hook.sh;
-
-  meta = {
-    homepage = "http://www.erlang.org/";
-    description = "Programming language used for massively scalable soft real-time systems";
-
-    longDescription = ''
-      Erlang is a programming language used to build massively scalable
-      soft real-time systems with requirements on high availability.
-      Some of its uses are in telecoms, banking, e-commerce, computer
-      telephony and instant messaging. Erlang's runtime system has
-      built-in support for concurrency, distribution and fault
-      tolerance.
-    '';
-
-    platforms = stdenv.lib.platforms.linux;
-    maintainers = [ stdenv.lib.maintainers.simons ];
-  };
-}
diff --git a/pkgs/servers/nosql/riak/1.3.1.nix b/pkgs/servers/nosql/riak/1.3.1.nix
deleted file mode 100644
index df85044b8d1a..000000000000
--- a/pkgs/servers/nosql/riak/1.3.1.nix
+++ /dev/null
@@ -1,65 +0,0 @@
-{ stdenv, fetchurl, fetchFromGitHub, unzip, erlangR15}:
-
-let
-  srcs = {
-    riak = fetchurl {
-      url = "http://s3.amazonaws.com/downloads.basho.com/riak/1.3/1.3.1/riak-1.3.1.tar.gz";
-      sha256 = "a69093fc5df1b79f58645048b9571c755e00c3ca14dfd27f9f1cae2c6e628f01";
-    };
-    leveldb = fetchFromGitHub {
-      owner  = "basho";
-      repo   = "leveldb";
-      rev    = "1.3.1";
-      sha256 = "1jvv260ic38657y4lwwcvzmhah8xai594xy19r28gkzlpra1lnbb";
-    };
-  };
-in
-stdenv.mkDerivation rec {
-  name = "riak-1.3.1";
-
-  buildInputs = [unzip erlangR15];
-
-  src = srcs.riak;
-
-  patches = [ ./riak-1.3.1.patch ./riak-admin-1.3.1.patch ];
-
-  postUnpack = ''
-    mkdir -p $sourceRoot/deps/eleveldb/c_src/leveldb
-    cp -r ${srcs.leveldb}/* $sourceRoot/deps/eleveldb/c_src/leveldb
-    chmod 755 -R $sourceRoot/deps/eleveldb/c_src/leveldb
-    pushd $sourceRoot/deps/
-    mkdir riaknostic/deps
-    cp -R lager riaknostic/deps
-    cp -R getopt riaknostic/deps
-    cp -R meck riaknostic/deps
-    popd
-    patchShebangs .
-  '';
-
-  buildPhase = ''
-    make rel
-  '';
-
-  doCheck = false;
-
-  installPhase = ''
-    mkdir $out
-    mv rel/riak/etc rel/riak/riak-etc
-    mkdir -p rel/riak/etc
-    mv rel/riak/riak-etc rel/riak/etc/riak
-    mv rel/riak/* $out
-  '';
-
-  meta = {
-    maintainers = [ stdenv.lib.maintainers.orbitz ];
-    description = "Dynamo inspired NoSQL DB by Basho";
-    longDescription = ''
-      This patches the riak and riak-admin scripts to work better in Nix.
-      Rather than the scripts using their own location to determine where
-      the data, log, and etc directories should live, the scripts expect
-      RIAK_DATA_DIR, RIAK_LOG_DIR, and RIAK_ETC_DIR to be defined
-      and use those.
-    '';
-    platforms   = stdenv.lib.platforms.all;
-  };
-}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index b1b39b90134d..c7e58a733a49 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5324,7 +5324,6 @@ let
   clooj = callPackage ../development/interpreters/clojure/clooj.nix { };
 
   erlangR14 = callPackage ../development/interpreters/erlang/R14.nix { };
-  erlangR15 = callPackage ../development/interpreters/erlang/R15.nix { };
   erlangR16 = callPackage ../development/interpreters/erlang/R16.nix { };
   erlangR16_odbc = callPackage ../development/interpreters/erlang/R16.nix { odbcSupport = true; };
   erlangR17 = callPackage ../development/interpreters/erlang/R17.nix { };
@@ -9802,8 +9801,7 @@ let
     sasl = cyrus_sasl;
   };
 
-  riak = callPackage ../servers/nosql/riak/1.3.1.nix { };
-  riak2 = callPackage ../servers/nosql/riak/2.1.1.nix { };
+  riak = callPackage ../servers/nosql/riak/2.1.1.nix { };
 
   influxdb = (callPackage ../servers/nosql/influxdb { }).bin // { outputs = [ "bin" ]; };