diff --git a/wpa_supplicant/ChangeLog b/wpa_supplicant/ChangeLog
index 9b6d7b0b0..447d947d3 100644
--- a/wpa_supplicant/ChangeLog
+++ b/wpa_supplicant/ChangeLog
@@ -6,6 +6,8 @@ ChangeLog for wpa_supplicant
 	* updated management frame protection to use IEEE 802.11w/D6.0
 	* added support for using SHA256-based stronger key derivation for WPA2
 	  (IEEE 802.11w)
+	* fixed FT (IEEE 802.11r) authentication after a failed association to
+	  use correct FTIE
 
 2008-08-10 - v0.6.4
 	* added support for EAP Sequences in EAP-FAST Phase 2
diff --git a/wpa_supplicant/wpa_supplicant.c b/wpa_supplicant/wpa_supplicant.c
index 4936a078a..4c9482f6a 100644
--- a/wpa_supplicant/wpa_supplicant.c
+++ b/wpa_supplicant/wpa_supplicant.c
@@ -923,6 +923,8 @@ void wpa_supplicant_associate(struct wpa_supplicant *wpa_s,
 		if (ie && ie[1] >= MOBILITY_DOMAIN_ID_LEN)
 			md = ie + 2;
 		wpa_sm_set_ft_params(wpa_s->wpa, md, NULL, 0, NULL);
+		/* Prepare for the next transition */
+		wpa_ft_prepare_auth_request(wpa_s->wpa);
 #endif /* CONFIG_IEEE80211R */
 	} else {
 		wpa_msg(wpa_s, MSG_INFO, "Trying to associate with SSID '%s'",