diff --git a/config/rootfiles/common/strongswan b/config/rootfiles/common/strongswan
index 1be9282bf..7564d38c8 100644
--- a/config/rootfiles/common/strongswan
+++ b/config/rootfiles/common/strongswan
@@ -168,7 +168,6 @@ usr/sbin/ipsec
 #usr/share/man/man5/ipsec.secrets.5
 #usr/share/man/man5/strongswan.conf.5
 #usr/share/man/man8/_updown.8
-#usr/share/man/man8/_updown_espmark.8
 #usr/share/man/man8/ipsec.8
 #usr/share/man/man8/openac.8
 #usr/share/man/man8/scepclient.8
diff --git a/lfs/backports b/lfs/backports
index 96de955d6..59baaccb2 100644
--- a/lfs/backports
+++ b/lfs/backports
@@ -90,7 +90,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/compat-drivers-3.8.3-ath_ignore_eeprom_regdomain.patch
 	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux-3.14.22-iwlwifi-noibss_only_on_radar_chan.patch
 	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux-3.10.37-rt2800usb_add_dlink_dwa137_usbid.patch
-	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/backports-3.18.1-1_rt2800usb_suppress_queue_warnings.patch
+	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/backports-3.18.1-1_rt2x00usb_suppress_queue_warnings.patch
 	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/backports-3.18.1-1_add_libertas_uap.patch
 
 	# smsc mac address patch for pandaboard and raspberry pi
diff --git a/lfs/hostapd b/lfs/hostapd
index 74c2ae86e..22528374a 100644
--- a/lfs/hostapd
+++ b/lfs/hostapd
@@ -32,7 +32,7 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = hostapd
-PAK_VER    = 33
+PAK_VER    = 34
 
 DEPS       = ""
 
@@ -77,6 +77,7 @@ $(subst %,%_MD5,$(objects)) :
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	@$(PREBUILD)
 	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
+	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/hostapd-2.3_increase_EAPOL-timeouts.patch
 	cd $(DIR_APP)/hostapd && cp $(DIR_SRC)/config/hostapd/config ./.config
 	cd $(DIR_APP)/hostapd && sed -e "s@/usr/local@/usr@g" -i Makefile
 	cd $(DIR_APP)/hostapd && make $(MAKETUNING) $(EXTRA_MAKE)
diff --git a/src/patches/backports-3.18.1-1_rt2800usb_suppress_queue_warnings.patch b/src/patches/backports-3.18.1-1_rt2x00usb_suppress_queue_warnings.patch
similarity index 65%
rename from src/patches/backports-3.18.1-1_rt2800usb_suppress_queue_warnings.patch
rename to src/patches/backports-3.18.1-1_rt2x00usb_suppress_queue_warnings.patch
index 8270d311d..3f9308e38 100644
--- a/src/patches/backports-3.18.1-1_rt2800usb_suppress_queue_warnings.patch
+++ b/src/patches/backports-3.18.1-1_rt2x00usb_suppress_queue_warnings.patch
@@ -1,6 +1,6 @@
 diff -Naur backports-3.18.1-1.org/drivers/net/wireless/rt2x00/rt2800usb.c backports-3.18.1-1/drivers/net/wireless/rt2x00/rt2800usb.c
 --- backports-3.18.1-1.org/drivers/net/wireless/rt2x00/rt2800usb.c	2014-12-21 22:37:14.000000000 +0100
-+++ backports-3.18.1-1/drivers/net/wireless/rt2x00/rt2800usb.c	2015-03-29 21:42:13.865183543 +0200
++++ backports-3.18.1-1/drivers/net/wireless/rt2x00/rt2800usb.c	2015-04-07 11:44:16.647963570 +0200
 @@ -444,7 +444,7 @@
  
  	rt2x00usb_register_read(rt2x00dev, TXRXQ_PCNT, &reg);
@@ -28,3 +28,15 @@ diff -Naur backports-3.18.1-1.org/drivers/net/wireless/rt2x00/rt2800usb.c backpo
  				    entry->entry_idx, qid);
  			break;
  		}
+diff -Naur backports-3.18.1-1.org/drivers/net/wireless/rt2x00/rt2x00usb.c backports-3.18.1-1/drivers/net/wireless/rt2x00/rt2x00usb.c
+--- backports-3.18.1-1.org/drivers/net/wireless/rt2x00/rt2x00usb.c	2014-12-21 22:37:14.000000000 +0100
++++ backports-3.18.1-1/drivers/net/wireless/rt2x00/rt2x00usb.c	2015-04-07 11:42:41.723492892 +0200
+@@ -524,7 +524,7 @@
+ 
+ static void rt2x00usb_watchdog_tx_dma(struct data_queue *queue)
+ {
+-	rt2x00_warn(queue->rt2x00dev, "TX queue %d DMA timed out, invoke forced forced reset\n",
++	rt2x00_dbg(queue->rt2x00dev, "TX queue %d DMA timed out, invoke forced reset\n",
+ 		    queue->qid);
+ 
+ 	rt2x00queue_stop_queue(queue);
diff --git a/src/patches/hostapd-2.3_increase_EAPOL-timeouts.patch b/src/patches/hostapd-2.3_increase_EAPOL-timeouts.patch
new file mode 100644
index 000000000..bbda55a63
--- /dev/null
+++ b/src/patches/hostapd-2.3_increase_EAPOL-timeouts.patch
@@ -0,0 +1,16 @@
+diff -Naur hostapd-2.3.org/src/ap/wpa_auth.c hostapd-2.3/src/ap/wpa_auth.c
+--- hostapd-2.3.org/src/ap/wpa_auth.c	2014-10-09 16:41:31.000000000 +0200
++++ hostapd-2.3/src/ap/wpa_auth.c	2015-04-07 16:32:10.671422975 +0200
+@@ -45,9 +45,9 @@
+ 
+ static const u32 dot11RSNAConfigGroupUpdateCount = 4;
+ static const u32 dot11RSNAConfigPairwiseUpdateCount = 4;
+-static const u32 eapol_key_timeout_first = 100; /* ms */
+-static const u32 eapol_key_timeout_subseq = 1000; /* ms */
+-static const u32 eapol_key_timeout_first_group = 500; /* ms */
++static const u32 eapol_key_timeout_first = 300; /* ms */
++static const u32 eapol_key_timeout_subseq = 3000; /* ms */
++static const u32 eapol_key_timeout_first_group = 1500; /* ms */
+ 
+ /* TODO: make these configurable */
+ static const int dot11RSNAConfigPMKLifetime = 43200;