diff --git a/net-mgmt/aircrack-ng/Makefile b/net-mgmt/aircrack-ng/Makefile
index dd371959a952..899d57c31ad5 100644
--- a/net-mgmt/aircrack-ng/Makefile
+++ b/net-mgmt/aircrack-ng/Makefile
@@ -1,63 +1,66 @@
 # Created by: Lars Engels <lars.engels@0x20.net>
 
 PORTNAME=	aircrack-ng
 DISTVERSION=	1.5.2
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	net-mgmt security
 MASTER_SITES=	http://download.aircrack-ng.org/
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	danfe@FreeBSD.org
 COMMENT=	802.11 WEP and WPA-PSK keys cracking program
 
 LICENSE=	GPLv2 BSD3CLAUSE APACHE20
 LICENSE_COMB=	dual
 
 BROKEN_aarch64=		fails to configure: _AX_COMPILER_VERSION_GNU unknown gcc major
 BROKEN_armv6=		fails to configure: _AX_COMPILER_VERSION_GNU unknown gcc major
 BROKEN_armv7=		fails to configure: _AX_COMPILER_VERSION_GNU unknown gcc major
 
 USES=		autoreconf cpe dos2unix gmake libtool ssl
 USE_GCC=	yes
 USE_LDCONFIG=	yes
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-experimental
 CPE_VERSION=	${DISTVERSION:C/-.*//}
 CPE_UPDATE=	${DISTVERSION:C/^[^-]*$//:C/.*-//}
 DOS2UNIX_FILES=	src/aircrack-osdep/byteorder.h
 CFLAGS+=	-I${OPENSSLINC}
 LDFLAGS+=	-L${OPENSSLLIB}
-# Don't call 'strip' target with WITH_DEBUG set
-#INSTALL_TARGET=	${STRIP:S/-s/strip/} install
+INSTALL_TARGET=	install-strip
 
-OPTIONS_DEFINE=	PCRE SQLITE
-OPTIONS_DEFAULT=PCRE SQLITE
+OPTIONS_DEFINE=	HWLOC PCRE SQLITE
+OPTIONS_DEFAULT=	HWLOC PCRE SQLITE
 OPTIONS_SUB=	yes
 
+HWLOC_DESC=	Use Hardware Locality to improve performance
+HWLOC_LIB_DEPENDS=	libhwloc.so:devel/hwloc2
+HWLOC_CONFIGURE_OFF=	--disable-hwloc
+
 PCRE_DESC=	Use Perl Compatible Regular Expressions for wesside
-PCRE_MAKE_ARGS=	pcre=true
 PCRE_LIB_DEPENDS=	libpcre.so:devel/pcre
 PCRE_USES=	pkgconfig
+PCRE_CONFIGURE_OFF=	--disable-pcre
 
 SQLITE_DESC=	Use SQLite for storing pre-computed key tables
 SQLITE_USES=	sqlite
-SQLITE_MAKE_ARGS=	sqlite=true
+SQLITE_CONFIGURE_OFF=	--without-sqlite3
 
 .include <bsd.port.pre.mk>
 
 .if ${ARCH:Mpowerpc*}
 PLIST_SUB+=	PPC="" \
 		X86="@comment "
 .elif ${ARCH} == amd64 || ${ARCH} == i386
 PLIST_SUB+=	PPC="@comment " \
 		X86=""
 .endif
 
 post-patch:
-	@${REINPLACE_CMD} \
-		-e 's|%%ETCDIR%%|${ETCDIR}|' ${WRKSRC}/scripts/airodump-ng-oui-update
+	@${REINPLACE_CMD} -e 's,/usr/local/etc/aircrack-ng,${ETCDIR},' \
+		${WRKSRC}/scripts/airodump-ng-oui-update
 
 post-install:
 	${MKDIR} ${STAGEDIR}${ETCDIR}
 
 .include <bsd.port.post.mk>
diff --git a/net-mgmt/aircrack-ng/files/patch-build_m4_aircrack__ng__pcre.m4 b/net-mgmt/aircrack-ng/files/patch-build_m4_aircrack__ng__pcre.m4
new file mode 100644
index 000000000000..5f399844478b
--- /dev/null
+++ b/net-mgmt/aircrack-ng/files/patch-build_m4_aircrack__ng__pcre.m4
@@ -0,0 +1,23 @@
+--- build/m4/aircrack_ng_pcre.m4.orig	2018-12-09 22:53:44 UTC
++++ build/m4/aircrack_ng_pcre.m4
+@@ -38,6 +38,10 @@ dnl If you delete this exception statement from all so
+ dnl program, then also delete it here.
+ 
+ AC_DEFUN([AIRCRACK_NG_PCRE], [
++
++AC_ARG_ENABLE([pcre],
++    AS_HELP_STRING([--disable-pcre],[Disable PCRE (libpcre).]))
++
+ AC_ARG_ENABLE(static-pcre,
+     AS_HELP_STRING([--enable-static-pcre],
+ 		[Enable statically linked PCRE libpcre.]),
+@@ -52,7 +56,9 @@ if test "x$static_pcre" != "xno"; then
+ 		HAVE_PCRE=no
+ 	fi
+ else
++    if test x$enable_pcre != xno; then
+ 	PKG_CHECK_MODULES(PCRE, libpcre, HAVE_PCRE=yes, HAVE_PCRE=no)
++    fi
+ fi
+ 
+ AS_IF([test "x$HAVE_PCRE" = "xyes"], [