diff --git a/pkgs/servers/monitoring/prometheus/fritzbox-exporter-deps.nix b/pkgs/servers/monitoring/prometheus/fritzbox-exporter-deps.nix
new file mode 100644
index 00000000000..2d94ffeba26
--- /dev/null
+++ b/pkgs/servers/monitoring/prometheus/fritzbox-exporter-deps.nix
@@ -0,0 +1,93 @@
+# This file was generated by https://github.com/kamilchm/go2nix v1.3.0
+[
+  {
+    goPackagePath = "github.com/123Haynes/go-http-digest-auth-client";
+    fetch = {
+      type = "git";
+      url = "https://github.com/123Haynes/go-http-digest-auth-client";
+      rev = "4c2ff1556cab0c8c14069d8d116c34db59c50c54";
+      sha256 = "0hpynnvwlxcdrrplvzibqk3179lzwkv8zlp03r6cd1vsd28b11ja";
+    };
+  }
+  {
+    goPackagePath = "github.com/beorn7/perks";
+    fetch = {
+      type = "git";
+      url = "https://github.com/beorn7/perks";
+      rev = "4b2b341e8d7715fae06375aa633dbb6e91b3fb46";
+      sha256 = "1i1nz1f6g55xi2y3aiaz5kqfgvknarbfl4f0sx4nyyb4s7xb1z9x";
+    };
+  }
+  {
+    goPackagePath = "github.com/golang/protobuf";
+    fetch = {
+      type = "git";
+      url = "https://github.com/golang/protobuf";
+      rev = "e91709a02e0e8ff8b86b7aa913fdc9ae9498e825";
+      sha256 = "16arbb7nwvs7lkpr7i9vrv8mk9h77zd3blzp3z9b0infqla4ddzc";
+    };
+  }
+  {
+    goPackagePath = "github.com/matttproud/golang_protobuf_extensions";
+    fetch = {
+      type = "git";
+      url = "https://github.com/matttproud/golang_protobuf_extensions";
+      rev = "c182affec369e30f25d3eb8cd8a478dee585ae7d";
+      sha256 = "1xqsf9vpcrd4hp95rl6kgmjvkv1df4aicfw4l5vfcxcwxknfx2xs";
+    };
+  }
+  {
+    goPackagePath = "github.com/mxschmitt/golang-env-struct";
+    fetch = {
+      type = "git";
+      url = "https://github.com/mxschmitt/golang-env-struct";
+      rev = "0c54aeca83972d1c7adf812b37dc53a6cbf58fb7";
+      sha256 = "19h840xhkglxwfbwx6w1qyndzg775b14kpz3xpq0lfrkfxdq0w9l";
+    };
+  }
+  {
+    goPackagePath = "github.com/pkg/errors";
+    fetch = {
+      type = "git";
+      url = "https://github.com/pkg/errors";
+      rev = "27936f6d90f9c8e1145f11ed52ffffbfdb9e0af7";
+      sha256 = "0yzmgi6g4ak4q8y7w6x0n5cbinlcn8yc3gwgzy4yck00qdn25d6y";
+    };
+  }
+  {
+    goPackagePath = "github.com/prometheus/client_golang";
+    fetch = {
+      type = "git";
+      url = "https://github.com/prometheus/client_golang";
+      rev = "3f6cbd95606771ac9f7b1c9247d2ca186cb72cb9";
+      sha256 = "1d9qc9jwqsgh6r5x5qkf6c6pkfb5jfhxls431ilhawn05fbyyypq";
+    };
+  }
+  {
+    goPackagePath = "github.com/prometheus/client_model";
+    fetch = {
+      type = "git";
+      url = "https://github.com/prometheus/client_model";
+      rev = "fd36f4220a901265f90734c3183c5f0c91daa0b8";
+      sha256 = "1bs5d72k361llflgl94c22n0w53j30rsfh84smgk8mbjbcmjsaa5";
+    };
+  }
+  {
+    goPackagePath = "github.com/prometheus/common";
+    fetch = {
+      type = "git";
+      url = "https://github.com/prometheus/common";
+      rev = "c873fb1f9420b83ee703b4361c61183b4619f74d";
+      sha256 = "1fmigir3c35nxmsj4bqwfp69kaxy415qk0ssi4wplcyd1g656lbg";
+    };
+  }
+  {
+    goPackagePath = "github.com/prometheus/procfs";
+    fetch = {
+      type = "git";
+      url = "https://github.com/prometheus/procfs";
+      rev = "87a4384529e0652f5035fb5cc8095faf73ea9b0b";
+      sha256 = "1rjd7hf5nvsdw2jpqpapfw6nv3w3zphfhkrh5p7nryakal6kcgmh";
+    };
+  }
+]
diff --git a/pkgs/servers/monitoring/prometheus/fritzbox-exporter.nix b/pkgs/servers/monitoring/prometheus/fritzbox-exporter.nix
index 1271b3d40e1..071035b2a4a 100644
--- a/pkgs/servers/monitoring/prometheus/fritzbox-exporter.nix
+++ b/pkgs/servers/monitoring/prometheus/fritzbox-exporter.nix
@@ -2,23 +2,25 @@
 
 buildGoPackage rec {
   name = "fritzbox-exporter-${version}";
-  version = "1.0";
-  rev = "v${version}";
+  version = "v1.0-32-g90fc0c5";
+  rev = "90fc0c572d3340803f7c2aafc4b097db7af1f871";
 
-  goPackagePath = "github.com/ndecker/fritzbox_exporter";
-
-  src= fetchFromGitHub {
+  src = fetchFromGitHub {
     inherit rev;
-    owner = "ndecker";
+    owner = "mxschmitt";
     repo = "fritzbox_exporter";
-    sha256 = "1qk3dgxxz3cnz52jzz0yvfkrkk4s5kdhc26nbfgdpn0ifzqj0awr";
+    sha256 = "08gcc60g187x1d14vh7n7s52zkqgj3fvg5v84i6dw55rmb6zzxri";
   };
 
+  goPackagePath = "github.com/mxschmitt/fritzbox_exporter";
+
+  goDeps = ./fritzbox-exporter-deps.nix;
+
   meta = with stdenv.lib; {
-    description = "FRITZ!Box UPnP statistics exporter for prometheus";
+    description = "Prometheus Exporter for FRITZ!Box (TR64 and UPnP)";
     homepage = https://github.com/ndecker/fritzbox_exporter;
     license = licenses.asl20;
-    maintainers = with maintainers; [ bachp ];
+    maintainers = with maintainers; [ bachp flokli ];
     platforms = platforms.unix;
   };
 }