diff --git a/hostapd/Makefile b/hostapd/Makefile
index 5fd6481..ef093e5 100644
--- a/hostapd/Makefile
+++ b/hostapd/Makefile
@@ -95,6 +95,7 @@
 LIBS += -lrt
 LIBS_c += -lrt
 LIBS_h += -lrt
+LIBS_n += -lrt
 endif
 
 OBJS += ../src/utils/common.o
diff --git a/hostapd/config_file.c b/hostapd/config_file.c
index 54e4af9..19d6ad3 100644
--- a/hostapd/config_file.c
+++ b/hostapd/config_file.c
@@ -1,6 +1,6 @@
 /*
  * hostapd / Configuration file parser
- * Copyright (c) 2003-2013, Jouni Malinen <j@w1.fi>
+ * Copyright (c) 2003-2014, Jouni Malinen <j@w1.fi>
  *
  * This software may be distributed under the terms of the BSD license.
  * See README for more details.
@@ -2188,6 +2188,8 @@
 			bss->radius_server_clients = os_strdup(pos);
 		} else if (os_strcmp(buf, "radius_server_auth_port") == 0) {
 			bss->radius_server_auth_port = atoi(pos);
+		} else if (os_strcmp(buf, "radius_server_acct_port") == 0) {
+			bss->radius_server_acct_port = atoi(pos);
 		} else if (os_strcmp(buf, "radius_server_ipv6") == 0) {
 			bss->radius_server_ipv6 = atoi(pos);
 #endif /* RADIUS_SERVER */
diff --git a/hostapd/defconfig b/hostapd/defconfig
index e329a11..8c8f0ea 100644
--- a/hostapd/defconfig
+++ b/hostapd/defconfig
@@ -55,10 +55,7 @@
 CONFIG_PEERKEY=y
 
 # IEEE 802.11w (management frame protection)
-# This version is an experimental implementation based on IEEE 802.11w/D1.0
-# draft and is subject to change since the standard has not yet been finalized.
-# Driver support is also needed for IEEE 802.11w.
-#CONFIG_IEEE80211W=y
+CONFIG_IEEE80211W=y
 
 # Integrated EAP server
 CONFIG_EAP=y
diff --git a/hostapd/hostapd.conf b/hostapd/hostapd.conf
index da7817f..c503ce2 100644
--- a/hostapd/hostapd.conf
+++ b/hostapd/hostapd.conf
@@ -971,6 +971,11 @@
 # The UDP port number for the RADIUS authentication server
 #radius_server_auth_port=1812
 
+# The UDP port number for the RADIUS accounting server
+# Commenting this out or setting this to 0 can be used to disable RADIUS
+# accounting while still enabling RADIUS authentication.
+#radius_server_acct_port=1813
+
 # Use IPv6 with RADIUS server (IPv4 will also be supported using IPv6 API)
 #radius_server_ipv6=1