diff --git a/pkgs/by-name/sp/sp800-90b-entropyassessment/package.nix b/pkgs/by-name/sp/sp800-90b-entropyassessment/package.nix
index 65387e276699..f2dff52adc3d 100644
--- a/pkgs/by-name/sp/sp800-90b-entropyassessment/package.nix
+++ b/pkgs/by-name/sp/sp800-90b-entropyassessment/package.nix
@@ -30,7 +30,8 @@ stdenv.mkDerivation (finalAttrs: {
 
   postPatch = ''
     substituteInPlace Makefile \
-      --replace "-march=native" ""
+      --replace-fail "-march=native" "" \
+      --replace-fail "-std=c++11" "-std=c++17"
   '';
 
   sourceRoot = "${finalAttrs.src.name}/cpp";
@@ -53,7 +54,6 @@ stdenv.mkDerivation (finalAttrs: {
     platforms = lib.platforms.linux;
     license = lib.licenses.nistSoftware;
     maintainers = with lib.maintainers; [
-      orichter
       thillux
     ];
   };