diff --git a/pkgs/tools/security/pwgen/default.nix b/pkgs/tools/security/pwgen/default.nix
index fc410f19843b..7870add420b0 100644
--- a/pkgs/tools/security/pwgen/default.nix
+++ b/pkgs/tools/security/pwgen/default.nix
@@ -1,17 +1,29 @@
-{lib, stdenv, fetchurl, autoreconfHook}:
+{ lib
+, stdenv
+, autoreconfHook
+, fetchFromGitHub
+}:
+
 stdenv.mkDerivation rec {
   pname = "pwgen";
   version = "2.08";
 
-  src = fetchurl {
-    url = "https://github.com/tytso/pwgen/archive/v${version}.tar.gz";
-    sha256 = "8d6e94f28655e61d6126290e3eafad4d17d7fba0d0d354239522a740a270bb2f";
+  src = fetchFromGitHub {
+    owner = "tytso";
+    repo = pname;
+    rev = "v${version}";
+    sha256 = "1j6c6m9fcy24jn8mk989x49yk765xb26lpr8yhpiaqk206wlss2z";
   };
 
-  nativeBuildInputs = [ autoreconfHook ];
+  nativeBuildInputs = [
+    autoreconfHook
+  ];
 
-  meta = {
+  meta = with lib; {
     description = "Password generator which creates passwords which can be easily memorized by a human";
-    platforms = lib.platforms.all;
+    homepage = "https://github.com/tytso/pwgen";
+    license = licenses.gpl2Only;
+    maintainers = with maintainers; [ fab ];
+    platforms = platforms.all;
   };
 }