diff --git a/net-p2p/amule-devel/Makefile b/net-p2p/amule-devel/Makefile
index 5483e61e039e..2a838e0ad993 100644
--- a/net-p2p/amule-devel/Makefile
+++ b/net-p2p/amule-devel/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	aMule
 PORTVERSION=	2.2.4
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	net-p2p
 MASTER_SITES=	SF/amule
 
@@ -45,7 +45,8 @@ OPTIONS=	OPTIMIZE "Build with optimization" on \
 		ALC "Compile aMule Link Creator (+GUI)" on \
 		AMULEDAEMON "Compile aMule daemon version - EXPERIMENTAL" off \
 		WXUNICODE "Enable Unicode support" on \
-		GEOIP "Enable GeoIP IP2Country support" off
+		GEOIP "Enable GeoIP IP2Country support" off \
+		UPNP "Enable Universal Plug and Play support" off
 
 DOCSDIR=	${PREFIX}/share/doc/aMule-${PORTVERSION}
 PORTDOCS=	ABOUT-NLS Changelog EC_Protocol.txt \
@@ -123,6 +124,13 @@ LIB_DEPENDS+=		GeoIP.5:${PORTSDIR}/net/GeoIP
 CONFIGURE_ARGS+=	--disable-geoip
 .endif
 
+.if defined(WITH_UPNP)
+CONFIGURE_ARGS+=	--with-libupnp-prefix=${LOCALBASE}
+LIB_DEPENDS+=		upnp.3:${PORTSDIR}/devel/upnp
+.else
+CONFIGURE_ARGS+=	--disable-upnp
+.endif
+
 .if !defined(WITHOUT_WXUNICODE)
 WX_UNICODE=yes
 .endif
diff --git a/net-p2p/amule/Makefile b/net-p2p/amule/Makefile
index 5483e61e039e..2a838e0ad993 100644
--- a/net-p2p/amule/Makefile
+++ b/net-p2p/amule/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	aMule
 PORTVERSION=	2.2.4
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	net-p2p
 MASTER_SITES=	SF/amule
 
@@ -45,7 +45,8 @@ OPTIONS=	OPTIMIZE "Build with optimization" on \
 		ALC "Compile aMule Link Creator (+GUI)" on \
 		AMULEDAEMON "Compile aMule daemon version - EXPERIMENTAL" off \
 		WXUNICODE "Enable Unicode support" on \
-		GEOIP "Enable GeoIP IP2Country support" off
+		GEOIP "Enable GeoIP IP2Country support" off \
+		UPNP "Enable Universal Plug and Play support" off
 
 DOCSDIR=	${PREFIX}/share/doc/aMule-${PORTVERSION}
 PORTDOCS=	ABOUT-NLS Changelog EC_Protocol.txt \
@@ -123,6 +124,13 @@ LIB_DEPENDS+=		GeoIP.5:${PORTSDIR}/net/GeoIP
 CONFIGURE_ARGS+=	--disable-geoip
 .endif
 
+.if defined(WITH_UPNP)
+CONFIGURE_ARGS+=	--with-libupnp-prefix=${LOCALBASE}
+LIB_DEPENDS+=		upnp.3:${PORTSDIR}/devel/upnp
+.else
+CONFIGURE_ARGS+=	--disable-upnp
+.endif
+
 .if !defined(WITHOUT_WXUNICODE)
 WX_UNICODE=yes
 .endif
diff --git a/net-p2p/amule2/Makefile b/net-p2p/amule2/Makefile
index 5483e61e039e..2a838e0ad993 100644
--- a/net-p2p/amule2/Makefile
+++ b/net-p2p/amule2/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	aMule
 PORTVERSION=	2.2.4
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	net-p2p
 MASTER_SITES=	SF/amule
 
@@ -45,7 +45,8 @@ OPTIONS=	OPTIMIZE "Build with optimization" on \
 		ALC "Compile aMule Link Creator (+GUI)" on \
 		AMULEDAEMON "Compile aMule daemon version - EXPERIMENTAL" off \
 		WXUNICODE "Enable Unicode support" on \
-		GEOIP "Enable GeoIP IP2Country support" off
+		GEOIP "Enable GeoIP IP2Country support" off \
+		UPNP "Enable Universal Plug and Play support" off
 
 DOCSDIR=	${PREFIX}/share/doc/aMule-${PORTVERSION}
 PORTDOCS=	ABOUT-NLS Changelog EC_Protocol.txt \
@@ -123,6 +124,13 @@ LIB_DEPENDS+=		GeoIP.5:${PORTSDIR}/net/GeoIP
 CONFIGURE_ARGS+=	--disable-geoip
 .endif
 
+.if defined(WITH_UPNP)
+CONFIGURE_ARGS+=	--with-libupnp-prefix=${LOCALBASE}
+LIB_DEPENDS+=		upnp.3:${PORTSDIR}/devel/upnp
+.else
+CONFIGURE_ARGS+=	--disable-upnp
+.endif
+
 .if !defined(WITHOUT_WXUNICODE)
 WX_UNICODE=yes
 .endif