diff --git a/.gitignore b/.gitignore
index 58e13e7..0764eb6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-/hostapd-2.3.tar.gz
+/hostapd-2.4.tar.gz
diff --git a/hostapd-RPM_OPT_FLAGS.patch b/hostapd-RPM_OPT_FLAGS.patch
deleted file mode 100644
index cf52765..0000000
--- a/hostapd-RPM_OPT_FLAGS.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -up hostapd-2.1/hostapd/Makefile.rpmopt hostapd-2.1/hostapd/Makefile
---- hostapd-2.1/hostapd/Makefile.rpmopt	2014-02-14 13:25:29.935475165 -0500
-+++ hostapd-2.1/hostapd/Makefile	2014-02-14 13:26:21.701915670 -0500
-@@ -6,6 +6,8 @@ ifndef CFLAGS
- CFLAGS = -MMD -O2 -Wall -g
- endif
- 
-+CFLAGS += $(EXTRA_CFLAGS)
-+
- CFLAGS += -I$(abspath ../src)
- CFLAGS += -I$(abspath ../src/utils)
- 
diff --git a/hostapd.spec b/hostapd.spec
index a06480c..b6d301a 100644
--- a/hostapd.spec
+++ b/hostapd.spec
@@ -1,8 +1,8 @@
 %global _hardened_build 1
 
 Name:           hostapd
-Version:        2.3
-Release:        4%{?dist}
+Version:        2.4
+Release:        1%{?dist}
 Summary:        IEEE 802.11 AP, IEEE 802.1X/WPA/WPA2/EAP/RADIUS Authenticator
 License:        BSD
 URL:            http://w1.fi/hostapd
@@ -12,8 +12,7 @@ Source1:        %{name}.service
 Source2:        %{name}.conf
 Source3:        %{name}.sysconfig
 Source4:        %{name}.init
-Patch0:         %{name}-RPM_OPT_FLAGS.patch
-Patch1:         %{name}-EAP-TLS-server-Fix-TLS-Message-Length-validation.patch
+Patch0:         %{name}-EAP-TLS-server-Fix-TLS-Message-Length-validation.patch
 
 BuildRequires:  libnl3-devel
 BuildRequires:  openssl-devel
@@ -52,12 +51,9 @@ Logwatch scripts for hostapd.
 %prep
 %setup -q
 
-# Hack Makefile to allow use of RPM_OPT_FLAGS
-%patch0 -p1 -b .rpmopt
-
 # git://w1.fi/srv/git/hostap.git
 # 	commit 586c446e0ff42ae00315b014924ec669023bd8de
-%patch1 -p1 -b .message_length
+%patch0 -p1 -b .message_length
 
 %build
 cd hostapd
@@ -67,6 +63,8 @@ cat defconfig | sed \
     -e '/^#CONFIG_DRIVER_WIRED=y/s/^#//' \
     -e '/^#CONFIG_DRIVER_NONE=y/s/^#//' \
     -e '/^#CONFIG_IEEE80211N=y/s/^#//' \
+    -e '/^#CONFIG_IEEE80211R=y/s/^#//' \
+    -e '/^#CONFIG_IEEE80211AC=y/s/^#//' \
     -e '/^#CONFIG_FULL_DYNAMIC_VLAN=y/s/^#//' \
     -e '/^#CONFIG_LIBNL32=y/s/^#//' \
     > .config
@@ -174,6 +172,10 @@ fi
 %{_sysconfdir}/logwatch/scripts/services/%{name}
 
 %changelog
+* Tue Apr 21 2015 John W. Linville <linville@redhat.com> - 2.4-1
+- Update to version 2.4 from upstream
+- Enable support for IEEE802.11r and IEEE802.11ac
+
 * Wed Feb  4 2015 John W. Linville <linville@redhat.com> - 2.3-4
 - Use %license instead of %doc for file containing license information
 
diff --git a/sources b/sources
index 46d37db..7747b08 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-40b89c61036add0c2dd1fc10767d3b5f  hostapd-2.3.tar.gz
+04578f3f2c3eb1bec1adf30473813912  hostapd-2.4.tar.gz