diff --git a/hostapd/ChangeLog b/hostapd/ChangeLog
index 6e4a869c0..9a000b100 100644
--- a/hostapd/ChangeLog
+++ b/hostapd/ChangeLog
@@ -17,6 +17,7 @@ ChangeLog for hostapd
 	* fixed EAP-TLS message processing for the last TLS message if it is
 	  large enough to require fragmentation (e.g., if a large Session
 	  Ticket data is included)
+	* fixed listen interval configuration for nl80211 drivers
 
 2008-11-01 - v0.6.5
 	* added support for SHA-256 as X.509 certificate digest when using the
diff --git a/hostapd/ieee802_11.c b/hostapd/ieee802_11.c
index 894d2bc56..4b50217a2 100644
--- a/hostapd/ieee802_11.c
+++ b/hostapd/ieee802_11.c
@@ -721,6 +721,7 @@ static void handle_assoc(struct hostapd_data *hapd,
 	}
 
 	sta->capability = capab_info;
+	sta->listen_interval = listen_interval;
 
 	/* followed by SSID and Supported rates; and HT capabilities if 802.11n
 	 * is used */