diff --git a/hostapd/ChangeLog b/hostapd/ChangeLog
index aa4e2b1a6..343efaa16 100644
--- a/hostapd/ChangeLog
+++ b/hostapd/ChangeLog
@@ -8,7 +8,7 @@ ChangeLog for hostapd
 	  be enabled by adding CONFIG_WPS=y into .config and setting the
 	  runtime configuration variables in hostapd.conf (see WPS section in
 	  the example configuration file); new hostapd_cli commands wps_pin and
-	  wps_pbc are used to configuration WPS negotiation; see README-WPS for
+	  wps_pbc are used to configure WPS negotiation; see README-WPS for
 	  more details
 	* added IEEE 802.11n HT capability configuration (ht_capab)
 	* added support for generating Country IE based on nl80211 regulatory
diff --git a/wpa_supplicant/ChangeLog b/wpa_supplicant/ChangeLog
index 53676129c..0c5ee9a80 100644
--- a/wpa_supplicant/ChangeLog
+++ b/wpa_supplicant/ChangeLog
@@ -1,5 +1,15 @@
 ChangeLog for wpa_supplicant
 
+????-??-?? - v0.6.7
+	* added support for Wi-Fi Protected Setup (WPS)
+	  (wpa_supplicant can now be configured to act as a WPS Enrollee to
+	  enroll credentials for a network using PIN and PBC methods; in
+	  addition, wpa_supplicant can act as a wireless WPS Registrar to
+	  configure an AP); WPS support can be enabled by adding CONFIG_WPS=y
+	  into .config and setting the runtime configuration variables in
+	  wpa_supplicant.conf (see WPS section in the example configuration
+	  file); new wpa_cli commands wps_pin, wps_pbc, and wps_reg are used to
+	  manage WPS negotiation; see README-WPS for more details
 2008-11-23 - v0.6.6
 	* added Milenage SIM/USIM emulator for EAP-SIM/EAP-AKA
 	  (can be used to simulate test SIM/USIM card with a known private key;
diff --git a/wpa_supplicant/README-WPS b/wpa_supplicant/README-WPS
index 85c8960bc..6a6a9417b 100644
--- a/wpa_supplicant/README-WPS
+++ b/wpa_supplicant/README-WPS
@@ -76,6 +76,14 @@ The network configuration blocks needed for WPS are added
 automatically based on control interface commands, so they do not need
 to be added explicitly in the configuration file.
 
+WPS registration will generate new network blocks for the acquired
+credentials. If these are to be stored for future use (after
+restarting wpa_supplicant), wpa_supplicant will need to be configured
+to allow configuration file updates:
+
+update_config=1
+
+
 
 External operations
 -------------------