diff --git a/pkgs/development/tools/analysis/smatch/default.nix b/pkgs/development/tools/analysis/smatch/default.nix
index 82a32504d73a..b22c1c4411fa 100644
--- a/pkgs/development/tools/analysis/smatch/default.nix
+++ b/pkgs/development/tools/analysis/smatch/default.nix
@@ -1,34 +1,39 @@
-{ lib, stdenv, fetchgit, sqlite, pkg-config, perl
-, buildllvmsparse ? true
-, buildc2xml ? true
-, llvm, libxml2
+{ lib
+, stdenv
+, fetchFromGitHub
+, pkg-config
+, sqlite
+, openssl
+, buildllvmsparse ? false
+, buildc2xml ? false
+, libllvm
+, libxml2
 }:
 
 stdenv.mkDerivation rec {
   pname = "smatch";
-  version = "20120924";
+  version = "1.72";
 
-  src = fetchgit {
-    url = "git://repo.or.cz/${pname}.git";
-    rev = "23656e3e578b700cbf96d043f039e6341a3ba5b9";
-    sha256 = "0r43qi6vryqg450fj73yjwbb7gzcgx64rhrhb3r1m6a252srijiy";
+  src = fetchFromGitHub {
+    owner = "error27";
+    repo = "smatch";
+    rev = version;
+    sha256 = "sha256-XVW4sAgIxaJjAk75bp/O286uddIfgfKtIA2LniUGWBM=";
   };
 
   nativeBuildInputs = [ pkg-config ];
-  buildInputs = [ sqlite perl ]
-   ++ lib.optional buildllvmsparse llvm
-   ++ lib.optional buildc2xml libxml2;
 
-  preBuild = ''
-    sed -i Makefile \
-      -e "s|^PREFIX=.*|PREFIX = $out|g"
-  '';
+  buildInputs = [ sqlite openssl ]
+    ++ lib.optionals buildllvmsparse [ libllvm ]
+    ++ lib.optionals buildc2xml [ libxml2.dev ];
+
+  makeFlags = [ "PREFIX=${placeholder "out"}" "CXX=${stdenv.cc.targetPrefix}c++" ];
 
   meta = with lib; {
     description = "A semantic analysis tool for C";
     homepage = "http://smatch.sourceforge.net/";
-    maintainers = with maintainers; [];
-    license = licenses.free; /* OSL, see http://www.opensource.org */
-    platforms = platforms.linux;
+    maintainers = with maintainers; [ ];
+    license = licenses.gpl2Plus;
+    platforms = platforms.all;
   };
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 51b8eb6f2688..1f22502e4e9a 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -16208,10 +16208,7 @@ with pkgs;
 
   sloc = nodePackages.sloc;
 
-  smatch = callPackage ../development/tools/analysis/smatch {
-    buildllvmsparse = false;
-    buildc2xml = false;
-  };
+  smatch = callPackage ../development/tools/analysis/smatch { };
 
   smc = callPackage ../tools/misc/smc { };