diff --git a/network/aircrack-ng-hak5/Makefile b/network/aircrack-ng-hak5/Makefile
new file mode 100644
index 0000000..06d7fb6
--- /dev/null
+++ b/network/aircrack-ng-hak5/Makefile
@@ -0,0 +1,58 @@
+#
+# Copyright (C) 2006-2015 OpenWrt.org
+# Copyright (C) 2018 seb@hak5.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=aircrack-ng-hak5
+PKG_VERSION:=1.2-rc4
+PKG_RELEASE:=1
+PKG_LICENSE:=GPLv2
+
+PKG_SOURCE_PROTO:=git
+PKG_SOURCE_URL:=https://github.com/aircrack-ng/aircrack-ng.git
+PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
+PKG_SOURCE_VERSION:=177ee2c040e93c03a1d8893c7de5bfe307435c6a
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
+
+PKG_BUILD_PARALLEL:=1
+PKG_INSTALL:=1
+
+include $(INCLUDE_DIR)/package.mk
+
+define Package/aircrack-ng-hak5
+  SECTION:=net
+  CATEGORY:=Network
+  DEPENDS:=+libpcap +libpthread +libopenssl +libnl +wireless-tools +ethtool +libstdcpp
+  TITLE:=WLAN tools for breaking 802.11 WEP/WPA keys
+  URL:=http://www.aircrack-ng.org/
+  MAINTAINER:=Sebastian Kinne <seb@hak5.org>
+  SUBMENU:=wireless
+endef
+
+define Package/aircrack-ng-hak5/description
+  WLAN tools for breaking 802.11 WEP/WPA keys
+endef
+
+MAKE_FLAGS += prefix=/usr \
+	libnl=true \
+	sqlite=false \
+	experimental=false \
+	stackprotector=false \
+	OSNAME=Linux 
+	
+
+CFLAGS="$(TARGET_CFLAGS) -Wall -Iinclude/ $(TARGET_CPPFLAGS) -D_REVISION=0" \
+
+define Package/aircrack-ng-hak5/install
+	$(INSTALL_DIR) $(1)/usr/bin
+	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/* $(1)/usr/bin/
+	$(INSTALL_DIR) $(1)/usr/sbin
+	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/* $(1)/usr/sbin/
+endef
+
+$(eval $(call BuildPackage,aircrack-ng-hak5))
\ No newline at end of file
diff --git a/network/aircrack-ng-hak5/patches/001-fix_lspci_errors_pineapple.patch b/network/aircrack-ng-hak5/patches/001-fix_lspci_errors_pineapple.patch
new file mode 100644
index 0000000..bb19a8b
--- /dev/null
+++ b/network/aircrack-ng-hak5/patches/001-fix_lspci_errors_pineapple.patch
@@ -0,0 +1,31 @@
+diff -Nur a/scripts/airmon-ng b/scripts/airmon-ng
+--- a/scripts/airmon-ng	2017-12-22 09:45:09.817778891 +1100
++++ b/scripts/airmon-ng	2017-12-22 09:54:13.417783325 +1100
+@@ -105,16 +105,17 @@
+ 	LSUSB=0
+ fi
+ 
+-if [ -d /sys/bus/pci ] || [ -d /sys/bus/pci_express ] || [ -d /proc/bus/pci ]; then
+-	if [ ! -x "$(command -v lspci 2>&1)" ]; then
+-		printf "Please install lspci from your distro's package manager.\n"
+-		exit 1
+-	else
+-		LSPCI=1
+-	fi
+-else
+-	LSPCI=0
+-fi
++LSPCI=0
++#if [ -d /sys/bus/pci ] || [ -d /sys/bus/pci_express ] || [ -d /proc/bus/pci ]; then
++#	if [ ! -x "$(command -v lspci 2>&1)" ]; then
++#		printf "Please install lspci from your distro's package manager.\n"
++#		exit 1
++#	else
++#		LSPCI=1
++#	fi
++#else
++#	LSPCI=0
++#fi
+ 
+ if [ -f /proc/modules ] || [ -d /sys/module ]; then
+ 	if [ ! -x "$(command -v modprobe 2>&1)" ]; then
diff --git a/network/aircrack-ng/Makefile b/network/aircrack-ng/Makefile
deleted file mode 100644
index 2ff5cca..0000000
--- a/network/aircrack-ng/Makefile
+++ /dev/null
@@ -1,51 +0,0 @@
-#
-# Copyright (C) 2006-2011 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=aircrack-ng
-PKG_VERSION:=1.2-rc2
-
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_SOURCE_URL:=http://download.aircrack-ng.org/ \
-	http://archive.aircrack-ng.org/aircrack-ng/$(PKG_VERSION)/
-#PKG_MD5SUM:=c2f8648c92f7e46051c86c618d4fb0d5
-PKG_MD5SUM:=ebe9d537f06f4d6956213af09c4476da
-
-PKG_BUILD_PARALLEL:=0
-PKG_INSTALL:=1
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/aircrack-ng
-  SECTION:=net
-  CATEGORY:=Network
-  DEPENDS:=+libpthread +libopenssl +libpcap +libnl-tiny
-  TITLE:=next generation of aircrack with new features
-  URL:=http://www.aircrack-ng.org/
-  SUBMENU:=wireless
-endef
-
-define Package/aircrack-ng/description
-Aircrack-ng is the next generation of aircrack with new features
-endef
-
-MAKE_FLAGS += \
-	CFLAGS="$(TARGET_CFLAGS) -Wall -Iinclude/ $(TARGET_CPPFLAGS) -D_REVISION=0" \
-	LDFLAGS="$(TARGET_LDFLAGS)" \
-	OSNAME=Linux \
-	prefix="/usr" \
-	sqlite="false" \
-
-define Package/aircrack-ng/install
-	$(INSTALL_DIR) $(1)/usr/bin
-	$(CP) $(PKG_INSTALL_DIR)/usr/bin/* $(1)/usr/bin/
-	$(INSTALL_DIR) $(1)/usr/sbin
-	$(CP) $(PKG_INSTALL_DIR)/usr/sbin/* $(1)/usr/sbin/
-endef
-
-$(eval $(call BuildPackage,aircrack-ng))
diff --git a/network/aircrack-ng/patches/100-fix-compile.path b/network/aircrack-ng/patches/100-fix-compile.path
deleted file mode 100644
index 6779f6b..0000000
--- a/network/aircrack-ng/patches/100-fix-compile.path
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Nur a/src/osdep/file.c b/src/osdep/file.c
---- a/src/osdep/file.c	2014-03-22 13:26:59.000000000 -0700
-+++ b/src/osdep/file.c	2014-11-03 13:57:33.939717098 -0800
-@@ -33,7 +33,7 @@
- #include <err.h>
- 
- #include "osdep.h"
--#include "pcap.h"
-+#include "../pcap.h"
- #include "radiotap/radiotap_iter.h"
- 
- struct priv_file {
diff --git a/network/aircrack-ng/patches/200-add-wep-only-add-wep-crack-num.patch b/network/aircrack-ng/patches/200-add-wep-only-add-wep-crack-num.patch
deleted file mode 100644
index 7295878..0000000
--- a/network/aircrack-ng/patches/200-add-wep-only-add-wep-crack-num.patch
+++ /dev/null
@@ -1,77 +0,0 @@
---- a/src/besside-ng.c	2014-07-11 19:24:03.000000000 -0700
-+++ b/src/besside-ng.c	2014-12-15 09:06:29.702175482 -0800
-@@ -1178,6 +1178,9 @@
- 	if (!_conf.cf_do_wep && n->n_crypto == CRYPTO_WEP)
- 		return 0;
- 
-+	if (!_conf.cf_do_wpa && n->n_crypto == CRYPTO_WPA)
-+		return 0;
-+
- 	return 1;
- }
- 
-@@ -3148,6 +3151,9 @@
- 		"       -W              : WPA only\n"
-                 "       -v              : verbose, -vv for more, etc.\n"
-                 "       -h              : This help screen\n"
-+                "       -w              : WEP only\n"
-+                "       -C       <num>  : Start WEP cracking at <num>\n"
-+                "                                     ^+ Default 5000\n"
-                 "\n",
-                 getVersion("Besside-ng", _MAJ, _MIN, _SUB_MIN, _REVISION, _BETA, _RC),
- 		prog);
-@@ -3165,14 +3171,53 @@
- 
- 	init_conf();
- 
--	while ((ch = getopt(argc, argv, "hb:vWs:c:p:R:")) != -1) {
-+	while ((ch = getopt(argc, argv, "hb:vWws:c:p:R:C:")) != -1) {
- 		switch (ch) {
- 		case 's':
- 			_conf.cf_wpa_server = optarg;
- 			break;
- 
- 		case 'W':
-+			if (_conf.cf_do_wpa != 0 )
-+			{
- 			_conf.cf_do_wep = 0;
-+			}
-+
-+			else { 
-+			printf("ERROR	:Please either WEP only or WPA only, but not both.\n");
-+			printf("	:If you desire to scan both WEP & WPA, dont use either -w or -W.\n");
-+			exit(1);
-+			}
-+
-+			break;
-+
-+		case 'C':
-+			// Used to set the ammount of iv's required to start cracking WEP key
-+
-+			
-+			_conf.cf_crack_int = (int) atoi(optarg);
-+
-+			// Check to make sure its not a null or negative number, if it is, then abort
-+			if ( (_conf.cf_crack_int) <= 0 )
-+				{
-+				printf("ERROR: Please enter a value of 1 or higher for -C.\n");
-+				exit(1);
-+				}
-+				
-+			break;
-+
-+		case 'w':
-+			// Used to only scan for WEP networks
-+			if (_conf.cf_do_wep != 0 )
-+			{
-+			_conf.cf_do_wpa = 0;
-+			}
-+			else { 
-+			printf("ERROR	:Please either WEP only or WPA only, but not both.\n");
-+			printf("	:If you desire to scan both WEP & WPA, dont use either -w or -W.\n");
-+			exit(1);
-+			}
-+			
- 			break;
- 
- 		case 'p':
diff --git a/network/aircrack-ng/patches/300-disable-pci-for-pineapple.patch b/network/aircrack-ng/patches/300-disable-pci-for-pineapple.patch
deleted file mode 100644
index b013078..0000000
--- a/network/aircrack-ng/patches/300-disable-pci-for-pineapple.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-diff -Nur aircrack-ng-1.2-rc2/scripts/airmon-ng aircrack-ng-1.2-rc2-patched/scripts/airmon-ng
---- aircrack-ng-1.2-rc2/scripts/airmon-ng	2015-04-09 06:05:24.000000000 +0200
-+++ aircrack-ng-1.2-rc2-patched/scripts/airmon-ng	2015-05-07 14:04:47.195184565 +0200
-@@ -100,18 +100,19 @@
- 	exit 1
- fi
- 
--if [ -d /proc/bus/pci ]
--then
--	if [ ! -x "$(command -v lspci 2>&1)" ]
--	then
--		printf "Please install lspci from your distro's package manager.\n"
--		exit 1
--	else
--		LSPCI=1
--	fi
--else
--	LSPCI=0
--fi
-+LSPCI=0
-+#if [ -d /proc/bus/pci ]
-+#then
-+#	if [ ! -x "$(command -v lspci 2>&1)" ]
-+#	then
-+#		printf "Please install lspci from your distro's package manager.\n"
-+#		exit 1
-+#	else
-+#		LSPCI=1
-+#	fi
-+#else
-+#	LSPCI=0
-+#fi
- 
- if [ -f /proc/modules ]
- then
-@@ -1189,7 +1190,10 @@
- 		else
- 			ifacet="\t\t"
- 		fi
--		printf "${PHYDEV}\t${iface}${ifacet}${DRIVER}${DRIVERt}${CHIPSET}"
-+		if [ "$PHYDEV" != "null" ]
-+		then
-+			printf "${PHYDEV}\t${iface}${ifacet}${DRIVER}${DRIVERt}${CHIPSET}"
-+		fi
- 	fi
- 
- 	if [ x$MAC80211 = "x1" ]