diff --git a/pkgs/tools/networking/miniupnpc/default.nix b/pkgs/tools/networking/miniupnpc/default.nix
index 65adb3c5eb89..019e99c82337 100644
--- a/pkgs/tools/networking/miniupnpc/default.nix
+++ b/pkgs/tools/networking/miniupnpc/default.nix
@@ -6,8 +6,7 @@ let
       pname = "miniupnpc";
       inherit version;
       src = fetchurl {
-        name = "${pname}-${version}.tar.gz";
-        url = "http://miniupnp.free.fr/files/download.php?file=${pname}-${version}.tar.gz";
+        url = "https://miniupnp.tuxfamily.org/files/${pname}-${version}.tar.gz";
         inherit sha256;
       };
 
@@ -24,7 +23,7 @@ let
       '';
 
       meta = with lib; {
-        homepage = "http://miniupnp.free.fr/";
+        homepage = "https://miniupnp.tuxfamily.org/";
         description = "A client that implements the UPnP Internet Gateway Device (IGD) specification";
         platforms = with platforms; linux ++ freebsd ++ darwin;
         license = licenses.bsd3;
@@ -32,8 +31,8 @@ let
     };
 in {
   miniupnpc_2 = generic {
-    version = "2.1.20190625";
-    sha256 = "1yqp0d8x5ldjfma5x2vhpg1aaafdg0470ismccixww3rzpbza8w7";
+    version = "2.2.4";
+    sha256 = "0jrc84lkc7xb53rb8dbswxrxj21ndj1iiclmk3r9wkp6xm55w6j8";
   };
   miniupnpc_1 = generic {
     version = "1.9.20160209";
diff --git a/pkgs/tools/networking/miniupnpd/default.nix b/pkgs/tools/networking/miniupnpd/default.nix
index da950cdd2b8e..b3a10fee2c4e 100644
--- a/pkgs/tools/networking/miniupnpd/default.nix
+++ b/pkgs/tools/networking/miniupnpd/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, fetchurl, iptables, libuuid, pkg-config
+{ stdenv, lib, fetchurl, iptables, libuuid, openssl, pkg-config
 , which, iproute2, gnused, coreutils, gawk, makeWrapper
 , nixosTests
 }:
@@ -8,20 +8,20 @@ let
 in
 stdenv.mkDerivation rec {
   pname = "miniupnpd";
-  version = "2.1.20190502";
+  version = "2.3.1";
 
   src = fetchurl {
-    url = "http://miniupnp.free.fr/files/download.php?file=miniupnpd-${version}.tar.gz";
-    sha256 = "1m8d0g9b0bjwsnqccw1yapp6n0jghmgzwixwjflwmvi2fi6hdp4b";
-    name = "miniupnpd-${version}.tar.gz";
+    url = "https://miniupnp.tuxfamily.org/files/miniupnpd-${version}.tar.gz";
+    sha256 = "0crv975qqppnj27jba96yysq2911y49vjd74sp9vnjb54z0d9pyi";
   };
 
-  buildInputs = [ iptables libuuid ];
+  buildInputs = [ iptables libuuid openssl ];
   nativeBuildInputs= [ pkg-config makeWrapper ];
 
-  makefile = "Makefile.linux";
 
-  buildFlags = [ "miniupnpd" "genuuid" ];
+  # ./configure is not a standard configure file, errors with:
+  # Option not recognized : --prefix=
+  dontAddPrefix = true;
 
   installFlags = [ "PREFIX=$(out)" "INSTALLPREFIX=$(out)" ];
 
@@ -37,7 +37,7 @@ stdenv.mkDerivation rec {
   };
 
   meta = with lib; {
-    homepage = "http://miniupnp.free.fr/";
+    homepage = "https://miniupnp.tuxfamily.org/";
     description = "A daemon that implements the UPnP Internet Gateway Device (IGD) specification";
     platforms = platforms.linux;
     license = licenses.bsd3;