diff --git a/net/libnatpmp/Makefile b/net/libnatpmp/Makefile
index 2b7f707f3d14..c49aeb62d3d6 100644
--- a/net/libnatpmp/Makefile
+++ b/net/libnatpmp/Makefile
@@ -1,34 +1,38 @@
 # Created by: Hung-Yi Chen <gaod@hychen.org>
 
 PORTNAME=	libnatpmp
-PORTVERSION=	20150609
+PORTVERSION=	20211229
 CATEGORIES=	net
-MASTER_SITES=	http://miniupnp.free.fr/files/
+
+PATCH_SITES=	https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/
+PATCHFILES+=	39ad4b34b967.patch:-p1	# https://github.com/miniupnp/libnatpmp/pull/20
+PATCHFILES+=	16ae5af7b7c5.patch:-p1	# https://github.com/miniupnp/libnatpmp/pull/21
+PATCHFILES+=	5f4a7c65837a.patch:-p1	# https://github.com/miniupnp/libnatpmp/pull/22
 
 MAINTAINER=	gaod@hychen.org
 COMMENT=	NAT-PMP lightweight library
 
 LICENSE=	BSD3CLAUSE
 
 USES=		gmake
 USE_LDCONFIG=	yes
 
+USE_GITHUB=	yes
+GH_ACCOUNT=	miniupnp
+GH_TAGNAME=	4b8b447
+
 MAKE_ARGS+=	CC="${CC}"
 MAKE_ENV+=	INSTALLPREFIX=${STAGEDIR}${PREFIX}
 
 PLIST_FILES=	bin/natpmpc \
 		include/natpmp.h \
+		include/natpmp_declspec.h \
 		lib/libnatpmp.a \
 		lib/libnatpmp.so \
 		lib/libnatpmp.so.1
 
-post-patch:
-	@${REINPLACE_CMD} -e 's/^LIBSPEC //' \
-		-e '/declspec\.h/d' \
-		${WRKSRC}/natpmp.h
-
 post-install:
 	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/natpmpc \
 		${STAGEDIR}${PREFIX}/lib/libnatpmp.so.1
 
 .include <bsd.port.mk>
diff --git a/net/libnatpmp/distinfo b/net/libnatpmp/distinfo
index 7219a862b0d0..52289422c28e 100644
--- a/net/libnatpmp/distinfo
+++ b/net/libnatpmp/distinfo
@@ -1,3 +1,9 @@
-TIMESTAMP = 1489487575
-SHA256 (libnatpmp-20150609.tar.gz) = e1aa9c4c4219bc06943d6b2130f664daee213fb262fcb94dd355815b8f4536b0
-SIZE (libnatpmp-20150609.tar.gz) = 24392
+TIMESTAMP = 1641963039
+SHA256 (miniupnp-libnatpmp-20211229-4b8b447_GH0.tar.gz) = c66ae17652c5c8b7625a64123bcbe73cc6d2cd897b87e1931c387a3bf6d80798
+SIZE (miniupnp-libnatpmp-20211229-4b8b447_GH0.tar.gz) = 26742
+SHA256 (39ad4b34b967.patch) = ee59bb5ee6c9cc597d6fd7dd1ca0ab2816207f8573017524f46b39397f0e9230
+SIZE (39ad4b34b967.patch) = 806
+SHA256 (16ae5af7b7c5.patch) = bf32f9746951fece16e1c5ae9def1e1aa47a579db7dcc8cd14b7a5f7c8d90ff3
+SIZE (16ae5af7b7c5.patch) = 665
+SHA256 (5f4a7c65837a.patch) = 65182f1dd723b7ec9720a44aca62ecb7c07757a1a13dd16f09aeab8a5629af99
+SIZE (5f4a7c65837a.patch) = 576
diff --git a/net/libnatpmp/pkg-descr b/net/libnatpmp/pkg-descr
index fe8797890363..4820b09fceee 100644
--- a/net/libnatpmp/pkg-descr
+++ b/net/libnatpmp/pkg-descr
@@ -1,6 +1,6 @@
 libnatpmp is an attempt to make a portable and fully compliant implementation
 of the protocol for the client side. It is based on non blocking sockets and
 all calls of the API are asynchronous. It is therefore very easy to integrate
 the NAT-PMP code to any event driven code.
 
-WWW: http://miniupnp.free.fr/
+WWW: https://github.com/miniupnp/libnatpmp