diff --git a/net-wireless/aircrack-ng/Manifest b/net-wireless/aircrack-ng/Manifest
index 82827231a..ddbd724d9 100644
--- a/net-wireless/aircrack-ng/Manifest
+++ b/net-wireless/aircrack-ng/Manifest
@@ -3,6 +3,7 @@ AUX airodump-ng-oui-update-path-fix.patch 572 RMD160 c0a97434709b31714e08b4e934b
 AUX airodump-ng.ignore-negative-one.v4.patch 5705 RMD160 d9d61e4229e2eda8afa0788826ada1b5fbb21524 SHA1 ad4f92e6e5200dab7e7fb177bab61894e8b7d7c4 SHA256 d77f676f0ccd83e1e192f78473ff77ea55be6b3c652e14921938cc3a79ac6a10
 AUX changeset_r1921_backport.diff 1941 RMD160 0f9cad828e631e053c2154da5af35bdf05ce88bb SHA1 44b16caa49cb58fbcb2d0de9c6bb4b921e47964b SHA256 a4655b208358b62a710f84206a69a5b0bb2091aeb47d73adbf0b7e8cd5a30c46
 AUX diff-wpa-migration-mode-aircrack-ng.diff 25165 RMD160 0a4ec44ab6580596f3f076e7b4a50a88118a4010 SHA1 be4c01c5128dd9c60f2074f616e5992112cc5735 SHA256 d36f2380d83fbfcbc48698cfd6d08de5a82a5a624a5d9f9cc3dbaaf7b7731fd8
+AUX eapol_fix.patch 1014 RMD160 e2974dcb3e29cbf38d8c83463f8ace17c82515e7 SHA1 28fdb0e78cd8e1b488ebed2ec02ae81c34e28602 SHA256 fcfaa1cfa75cbaac214ac3cb01b8401ff062f356acc75be39ea725fc42e10132
 AUX ignore-channel-1-error.patch 2270 RMD160 8347757e50f637d2a5dcb98c92bea0218ee49998 SHA1 a760259c3f19b1b2a6e8caf3ab2567e78b09822a SHA256 aa2345b9ba7b59c79e54a5546f28398aaea4068c7030b520069e25f71cd029e4
 AUX pic-fix.patch 4838 RMD160 c2022a1cc2a3fc546d9e5f9a8343c0276fb710de SHA1 4a15018748f784408318475b0238d11a07bc8faf SHA256 33d1693ec0cbea1933bdfcaa30a16bab2d566927a0c7eaf57cd7cb08886c4cba
 DIST aircrack-ng-1.0.tar.gz 1506412 RMD160 e8360aabbec1e7e038f86579e1004234f0899409 SHA1 8a3c5b8e322ea11e5559109a9f9d668ad6aee5f0 SHA256 65c2ad69a5522282b2c3c51daeceff70ecaff2d9ef4ff9c915a018f1d87680cd
@@ -13,4 +14,5 @@ EBUILD aircrack-ng-1.1-r2.ebuild 1348 RMD160 bf9c69f91594d5e6aa5a5f993dc3f3e98b2
 EBUILD aircrack-ng-1.1-r3.ebuild 1292 RMD160 3e21c3543493d1ff6fe657fa86a234349bee68f5 SHA1 e8d5743ab3b769942493a01e001d12f05ca6904b SHA256 bb9bc269d1f1779d311f68a62dddc61715046f3c94cd1522cc79fa5d3e659b67
 EBUILD aircrack-ng-1.1-r4.ebuild 1471 RMD160 aad6f772f725eb0736c9999b514f7e997f1d8973 SHA1 687f017e5856ce9259cd72bd571c8f73787361a4 SHA256 bae72916c573d0995ae6f727f4053837807044918f584455eabceadda87a48d9
 EBUILD aircrack-ng-1.1-r5.ebuild 1641 RMD160 97f0d61a11eb4e22a1e935b27c1c83e82d3dc7ed SHA1 abe2b826318a98a201fdb798faf45bd43e3d8fbf SHA256 4f0be9fe3a546002b06d9cc305ea6aaf2b06bc218c14ae204a9c01e243142a19
+EBUILD aircrack-ng-1.1-r6.ebuild 1679 RMD160 7cb9cce0acc51a211839dfd38ed9159ec5529720 SHA1 8bd46f55349d9b1df05abb22d1bcc7e6251bf1fe SHA256 8f61f63da08aa99952de006136c726ab573f480955d4ed6427515b3cf10e6650
 EBUILD aircrack-ng-1.1.ebuild 1036 RMD160 59f04ea637fef17a894402e111a83e8400309599 SHA1 f478461f19068df386a2cc00288c75aa9aeadee7 SHA256 b0293724ef712844120b165aac7f3d4448f70add05ec1eda9c94b88d0f950cc0
diff --git a/net-wireless/aircrack-ng/aircrack-ng-1.1-r6.ebuild b/net-wireless/aircrack-ng/aircrack-ng-1.1-r6.ebuild
new file mode 100644
index 000000000..67f2370cc
--- /dev/null
+++ b/net-wireless/aircrack-ng/aircrack-ng-1.1-r6.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI="4"
+
+inherit versionator
+
+MY_PV=$(replace_version_separator 2 '-')
+
+DESCRIPTION="WLAN tools for breaking 802.11 WEP/WPA keys"
+HOMEPAGE="http://www.aircrack-ng.org"
+SRC_URI="http://download.aircrack-ng.org/${PN}-${MY_PV}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="x86 amd64 arm"
+
+IUSE="+sqlite +unstable"
+
+DEPEND="dev-libs/openssl
+		sqlite? ( >=dev-db/sqlite-3.4 )"
+RDEPEND="${DEPEND}
+	net-wireless/iw"
+
+S="${WORKDIR}/${PN}-${MY_PV}"
+
+have_sqlite() {
+	use sqlite && echo "true" || echo "false"
+}
+
+have_unstable() {
+	use unstable && echo "true" || echo "false"
+}
+
+src_prepare() {
+	#backports
+	epatch "${FILESDIR}/${P}-respect_LDFLAGS.patch"
+	epatch "${FILESDIR}"/diff-wpa-migration-mode-aircrack-ng.diff
+	epatch "${FILESDIR}"/ignore-channel-1-error.patch
+	epatch "${FILESDIR}"/airodump-ng.ignore-negative-one.v4.patch
+	epatch "${FILESDIR}"/pic-fix.patch
+	epatch "${FILESDIR}"/changeset_r1921_backport.diff
+	epatch "${FILESDIR}"/eapol_fix.patch
+
+	#likely to stay after version bump
+	epatch "${FILESDIR}"/airodump-ng-oui-update-path-fix.patch
+}
+
+src_compile() {
+	emake CC="$(tc-getCC)" LD="$(tc-getLD)" sqlite=$(have_sqlite) unstable=$(have_unstable) || die "emake failed"
+}
+
+src_install() {
+	emake \
+		prefix="${ROOT}/usr" \
+		mandir="${ROOT}/usr/share/man/man1" \
+		DESTDIR="${ED}" \
+		sqlite=$(have_sqlite) \
+		unstable=$(have_unstable) \
+		install \
+		|| die "emake install failed"
+
+	dodoc AUTHORS ChangeLog INSTALLING README
+	dodir /etc/aircrack-ng/
+	wget http://standards.ieee.org/regauth/oui/oui.txt -O "${ED}"/etc/aircrack-ng/airodump-ng-oui.txt
+}
diff --git a/net-wireless/aircrack-ng/files/eapol_fix.patch b/net-wireless/aircrack-ng/files/eapol_fix.patch
new file mode 100644
index 000000000..38490b827
--- /dev/null
+++ b/net-wireless/aircrack-ng/files/eapol_fix.patch
@@ -0,0 +1,20 @@
+--- src/airodump-ng.c
++++ src/airodump-ng.c
+@@ -2126,7 +2126,7 @@
+                     st_cur->wpa.eapol_size = ( h80211[z + 2] << 8 )
+                             +   h80211[z + 3] + 4;
+ 
+-                    if ((int)pkh.len - z < st_cur->wpa.eapol_size  || st_cur->wpa.eapol_size == 0)
++                    if (caplen - z < st_cur->wpa.eapol_size  || st_cur->wpa.eapol_size == 0 || caplen - z < 81 + 16 || st_cur->wpa.eapol_size > 256)
+ 					{
+ 						// Ignore the packet trying to crash us.
+                     	goto write_packet;
+@@ -2158,7 +2158,7 @@
+                     st_cur->wpa.eapol_size = ( h80211[z + 2] << 8 )
+                             +   h80211[z + 3] + 4;
+ 
+-                    if ((int)pkh.len - z < st_cur->wpa.eapol_size  || st_cur->wpa.eapol_size == 0)
++		    if (caplen - z < st_cur->wpa.eapol_size  || st_cur->wpa.eapol_size == 0 || caplen - z < 81 + 16 || st_cur->wpa.eapol_size > 256)
+ 					{
+ 						// Ignore the packet trying to crash us.
+                     	goto write_packet;