diff --git a/wpa_supplicant/trunk/PKGBUILD b/wpa_supplicant/trunk/PKGBUILD
index f5d8522f4e10..ff3d7f880943 100644
--- a/wpa_supplicant/trunk/PKGBUILD
+++ b/wpa_supplicant/trunk/PKGBUILD
@@ -17,7 +17,7 @@ source=(https://w1.fi/releases/${pkgname}-${pkgver}.tar.gz{,.asc}
 validpgpkeys=('EC4AA0A991A5F2464582D52D2B6EF432EFC895FA') # Jouni Malinen
 sha256sums=('b4936d34c4e6cdd44954beba74296d964bc2c9668ecaa5255e499636fe2b1450'
             'SKIP'
-            '5163609e133851dfbbee5982954fab22e45bf2c9093e43eb466d8a2c39f8a012')
+            'e0f2909a7c770ca783487ad43930833b179dd22ee998ea16bc31373ee5c1843c')
 
 prepare() {
   cd "${srcdir}/${pkgname}-${pkgver}/${pkgname}"
@@ -30,12 +30,15 @@ build() {
   # The Makefile does not pick up our CPPFLAGS
   export CFLAGS="$CPPFLAGS $CFLAGS"
   make LIBDIR=/usr/lib BINDIR=/usr/bin
+  make LIBDIR=/usr/lib BINDIR=/usr/bin eapol_test
 }
 
 package() {
   cd "${srcdir}/${pkgname}-${pkgver}/${pkgname}"
   make LIBDIR=/usr/lib BINDIR=/usr/bin DESTDIR="${pkgdir}" install
 
+  install -m755 eapol_test "${pkgdir}/usr/bin/eapol_test"
+
   install -d -m755 "${pkgdir}/etc/wpa_supplicant"
   install -m644 wpa_supplicant.conf "${pkgdir}/etc/wpa_supplicant/wpa_supplicant.conf"
 
diff --git a/wpa_supplicant/trunk/config b/wpa_supplicant/trunk/config
index 906eadd7c38a..271fd98b1395 100644
--- a/wpa_supplicant/trunk/config
+++ b/wpa_supplicant/trunk/config
@@ -512,3 +512,6 @@ CONFIG_IBSS_RSN=y
 
 # Simple background scan
 CONFIG_BGSCAN_SIMPLE=y
+
+# Enable IPv6 support in eapol_test
+CONFIG_IPV6=y