diff --git a/pkgs/tools/graphics/pngquant/default.nix b/pkgs/tools/graphics/pngquant/default.nix
index 985b8a1c59d5..3d381bc1b67c 100644
--- a/pkgs/tools/graphics/pngquant/default.nix
+++ b/pkgs/tools/graphics/pngquant/default.nix
@@ -1,29 +1,23 @@
-{ stdenv, fetchFromGitHub, pkgconfig, libpng, zlib, lcms2 }:
+{ stdenv, fetchgit, pkgconfig, libpng, zlib, lcms2 }:
 
 stdenv.mkDerivation rec {
   name = "pngquant-${version}";
-  version = "2.6.0";
+  version = "2.9.1";
 
-  src = fetchFromGitHub {
-    owner = "pornel";
-    repo = "pngquant";
-    rev = version;
-    sha256 = "0sdh9cz330rhj6xvqk3sdhy0393qwyl349klk9r55g88rjp774s5";
+  src = fetchgit {
+    url = "https://www.github.com/pornel/pngquant.git";
+    rev = "refs/tags/${version}";
+    sha256 = "0xhnrjsk55jy5q68f81y7l61c6x18i4fzkm3i4dgndrhri5g4n1q";
+    fetchSubmodules = true;
   };
 
-  preConfigure = "patchShebangs .";
-
   buildInputs = [ pkgconfig libpng zlib lcms2 ];
 
-  preInstall = ''
-    mkdir -p $out/bin
-    export PREFIX=$out
-  '';
-
   meta = with stdenv.lib; {
     homepage = https://pngquant.org/;
     description = "A tool to convert 24/32-bit RGBA PNGs to 8-bit palette with alpha channel preserved";
     platforms = platforms.linux;
-    license = licenses.bsd2; # Not exactly bsd2, but alike
+    license = licenses.gpl3;
+    maintainers = [ maintainers.volth ];
   };
 }