diff --git a/pkgs/os-specific/linux/rdma-core/default.nix b/pkgs/os-specific/linux/rdma-core/default.nix
index 6acd327ef0e..e604f73de2d 100644
--- a/pkgs/os-specific/linux/rdma-core/default.nix
+++ b/pkgs/os-specific/linux/rdma-core/default.nix
@@ -1,9 +1,10 @@
-{ stdenv, fetchFromGitHub, cmake, pkgconfig, pandoc
-, ethtool, iproute, libnl, udev, python, perl
+{ stdenv, fetchFromGitHub, cmake, pkgconfig, docutils
+, pandoc, ethtool, iproute, libnl, udev, python, perl
+, makeWrapper
 } :
 
 let
-  version = "24.0";
+  version = "25.0";
 
 in stdenv.mkDerivation {
   name = "rdma-core-${version}";
@@ -12,10 +13,10 @@ in stdenv.mkDerivation {
     owner = "linux-rdma";
     repo = "rdma-core";
     rev = "v${version}";
-    sha256 = "038msip4fnd8fh6m0vhnqwsaarp86dbnc9hvf5n19aqhlqbabbdc";
+    sha256 = "1r1gfps1xckky06ib1rbf6lp58v2jqpy1ipkr45rf55gpaxf93cj";
   };
 
-  nativeBuildInputs = [ cmake pkgconfig pandoc ];
+  nativeBuildInputs = [ cmake pkgconfig pandoc docutils makeWrapper ];
   buildInputs = [ libnl ethtool iproute udev python perl ];
 
   cmakeFlags = [
@@ -28,6 +29,22 @@ in stdenv.mkDerivation {
       --replace ethtool "${ethtool}/bin/ethtool" \
       --replace 'ip addr' "${iproute}/bin/ip addr" \
       --replace 'ip link' "${iproute}/bin/ip link"
+
+    substituteInPlace srp_daemon/srp_daemon.sh.in \
+      --replace /bin/rm rm
+  '';
+
+  postInstall = ''
+    # cmake script is buggy, move file manually
+    mkdir -p $out/${perl.libPrefix}
+    mv $out/share/perl5/* $out/${perl.libPrefix}
+  '';
+
+  postFixup = ''
+    for pls in $out/bin/{ibfindnodesusing.pl,ibidsverify.pl}; do
+      echo "wrapping $pls"
+      wrapProgram $pls --prefix PERL5LIB : "$out/${perl.libPrefix}"
+    done
   '';
 
   meta = with stdenv.lib; {
diff --git a/pkgs/tools/networking/infiniband-diags/default.nix b/pkgs/tools/networking/infiniband-diags/default.nix
deleted file mode 100644
index 81a43d672fd..00000000000
--- a/pkgs/tools/networking/infiniband-diags/default.nix
+++ /dev/null
@@ -1,44 +0,0 @@
-{ stdenv, fetchFromGitHub, autoconf, automake, libtool, pkgconfig, rdma-core
-, opensm, perl, makeWrapper }:
-
-stdenv.mkDerivation rec {
-  name = "infiniband-diags-${version}";
-  version = "2.2.0";
-
-  src = fetchFromGitHub {
-    owner = "linux-rdma";
-    repo = "infiniband-diags";
-    rev = version;
-    sha256 = "0dhidwscvv8rffgjl6ygrz7daf61wbgabzhb6v8wh5kccml90mxi";
-  };
-
-  nativeBuildInputs = [ autoconf automake libtool pkgconfig makeWrapper ];
-
-  buildInputs = [ rdma-core opensm perl ];
-
-  preConfigure = ''
-    export CFLAGS="-I${opensm}/include/infiniband"
-    ./autogen.sh
-  '';
-
-  configureFlags = [ "--with-perl-installdir=\${out}/${perl.libPrefix}" "--sbindir=\${out}/bin" ];
-
-  postInstall = ''
-    rmdir $out/var/run $out/var
-  '';
-
-  postFixup = ''
-    for pls in $out/bin/{ibfindnodesusing.pl,ibidsverify.pl}; do
-      echo "wrapping $pls"
-      wrapProgram $pls --prefix PERL5LIB : "$out/${perl.libPrefix}"
-    done
-  '';
-
-  meta = with stdenv.lib; {
-    description = "Utilities designed to help configure, debug, and maintain infiniband fabrics";
-    homepage = http://linux-rdma.org/;
-    license =  licenses.bsd2; # Or GPL 2
-    maintainers = [ maintainers.aij ];
-    platforms = [ "x86_64-linux" ];
-  };
-}
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 7283c2ce534..0fc785f51c4 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -149,6 +149,7 @@ mapAliases ({
   htmlTidy = html-tidy;  # added 2014-12-06
   iana_etc = iana-etc;  # added 2017-03-08
   idea = jetbrains; # added 2017-04-03
+  infiniband-diags = rdma-core; # added 2019-08-09
   inotifyTools = inotify-tools;
   jbuilder = dune; # added 2018-09-09
   joseki = apache-jena-fuseki; # added 2016-02-28
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index c4096f24b5f..aa4cbe824c8 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3878,8 +3878,6 @@ in
 
   inetutils = callPackage ../tools/networking/inetutils { };
 
-  infiniband-diags = callPackage ../tools/networking/infiniband-diags { };
-
   inform7 = callPackage ../development/compilers/inform7 { };
 
   infamousPlugins = callPackage ../applications/audio/infamousPlugins { };