diff --git a/net/miniupnpd/Makefile b/net/miniupnpd/Makefile
index 3c5e4e28f813..1c9e6e87aebd 100644
--- a/net/miniupnpd/Makefile
+++ b/net/miniupnpd/Makefile
@@ -1,58 +1,55 @@
 PORTNAME=	miniupnpd
-PORTVERSION=	2.3.3
+DISTVERSION=	2.3.3
+PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	net
 
 MAINTAINER=	squat@squat.no
-COMMENT=	UPnP IGD implementation which uses pf/ipf
+COMMENT=	UPnP IGD implementation which uses pf
 WWW=		http://miniupnp.free.fr/
 
 LICENSE=	BSD3CLAUSE
 
 USES=		cpe ssl
 CPE_VENDOR=	miniupnp_project
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	miniupnp
 GH_PROJECT=	miniupnp
 GH_TAGNAME=	e439318
 
 USE_RC_SUBR=	miniupnpd
 
 HAS_CONFIGURE=	yes
 MAKE_JOBS_UNSAFE=	yes
 
 CFLAGS+=	-I${OPENSSLINC}
 LDFLAGS+=	-L${OPENSSLLIB}
 
 WRKSRC_SUBDIR=	miniupnpd
 
 PLIST_FILES=	etc/miniupnpd.conf.sample \
 		man/man8/miniupnpd.8.gz \
 		sbin/miniupnpd
 
+# unconditionally use pf, ipfw does not work on FreeBSD
+CONFIGURE_ARGS=	--firewall=pf
+
 OPTIONS_DEFINE=			CHECK_PORTINUSE IPV6 LEASEFILE UPNP_IGDV2 \
 				UPNP_STRICT
-OPTIONS_DEFAULT=		AUTODETECT_FW
-OPTIONS_SINGLE=			FIREWALL
-OPTIONS_SINGLE_FIREWALL=	AUTODETECT_FW IPFW PF
-AUTODETECT_FW_DESC=		Try to autodetect firewall type
 CHECK_PORTINUSE_DESC=		Check if ports are in use
-IPFW_DESC=			Use IPFW as firewall type
 LEASEFILE_DESC=			Enable lease file
-PF_DESC=			Use PF as firewall type
 UPNP_IGDV2_DESC=		Build an IGDv2 instead of an IGDv1
 UPNP_STRICT_DESC=		More strict UPnP specification compliance
 
 CHECK_PORTINUSE_CONFIGURE_ON=	--portinuse
 IPV6_CONFIGURE_ON=		--ipv6
 LEASEFILE_CONFIGURE_ON=		--leasefile
-PF_CONFIGURE_ON=		--firewall=pf
 UPNP_IGDV2_CONFIGURE_ON=	--igd2
 UPNP_STRICT_CONFIGURE_ON=	--strict
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|\(-lssl -lcrypto\)|$$(LDFLAGS) \1|g' \
 	${WRKSRC}/Makefile.bsd
 
 .include <bsd.port.mk>