diff --git a/pkgs/tools/system/hwinfo/default.nix b/pkgs/tools/system/hwinfo/default.nix
index 57dfbbeeeb9..8dd95a8b4de 100644
--- a/pkgs/tools/system/hwinfo/default.nix
+++ b/pkgs/tools/system/hwinfo/default.nix
@@ -1,12 +1,14 @@
-{ stdenv, fetchurl, libx86emu, flex, perl }:
+{ stdenv, fetchFromGitHub, libx86emu, flex, perl }:
 
 stdenv.mkDerivation rec {
   name = "hwinfo-${version}";
-  version = "21.23";
+  version = "21.38";
 
-  src = fetchurl {
-    url = "https://github.com/opensuse/hwinfo/archive/${version}.tar.gz";
-    sha256 = "1a8815zp3a7n2jx0cn0hcr69rfr6vmw8r8grbn5mv61g90bbcj6p";
+  src = fetchFromGitHub {
+    owner = "opensuse";
+    repo = "hwinfo";
+    rev = "${version}";
+    sha256 = "17a1nx906gdl9br1wf6xmhjy195szaxxmyb119vayw4q112rjdql";
   };
 
   patchPhase = ''
@@ -29,7 +31,7 @@ stdenv.mkDerivation rec {
     description = "Hardware detection tool from openSUSE";
     license = licenses.gpl2;
     homepage = https://github.com/openSUSE/hwinfo;
-    maintainers = with maintainers; [ bobvanderlinden ];
+    maintainers = with maintainers; [ bobvanderlinden ndowens ];
     platforms = platforms.unix;
   };
 }