diff --git a/hostapd/ChangeLog b/hostapd/ChangeLog
index 46c6696df..8b29ba8da 100644
--- a/hostapd/ChangeLog
+++ b/hostapd/ChangeLog
@@ -1,6 +1,6 @@
 ChangeLog for hostapd
 
-????-??-?? - v0.6.4
+2008-08-10 - v0.6.4
 	* added peer identity into EAP-FAST PAC-Opaque and skip Phase 2
 	  Identity Request if identity is already known
 	* added support for EAP Sequences in EAP-FAST Phase 2
diff --git a/src/common/version.h b/src/common/version.h
index e083a2c03..2ff8f6766 100644
--- a/src/common/version.h
+++ b/src/common/version.h
@@ -1,6 +1,6 @@
 #ifndef VERSION_H
 #define VERSION_H
 
-#define VERSION_STR "0.6.3"
+#define VERSION_STR "0.6.4"
 
 #endif /* VERSION_H */
diff --git a/wpa_supplicant/ChangeLog b/wpa_supplicant/ChangeLog
index cd08ab8c1..399bcd873 100644
--- a/wpa_supplicant/ChangeLog
+++ b/wpa_supplicant/ChangeLog
@@ -1,6 +1,6 @@
 ChangeLog for wpa_supplicant
 
-????-??-?? - v0.6.4
+2008-08-10 - v0.6.4
 	* added support for EAP Sequences in EAP-FAST Phase 2
 	* added support for using TNC with EAP-FAST
 	* added driver_ps3 for the PS3 Linux wireless driver
diff --git a/www/hostapd/index.html b/www/hostapd/index.html
index 72331e4a0..198c02579 100644
--- a/www/hostapd/index.html
+++ b/www/hostapd/index.html
@@ -131,7 +131,7 @@ for the current documentation.</b></p>
 </ul>
 <li>Latest development release:
 <ul>
-<li><a href="../releases/hostapd-0.6.3.tar.gz">hostapd-0.6.3.tar.gz</a></li>
+<li><a href="../releases/hostapd-0.6.4.tar.gz">hostapd-0.6.4.tar.gz</a></li>
 </ul>
 <li>ChangeLog:
 <ul>
@@ -266,7 +266,7 @@ Internet Systems Consortium (ISC).
     <address><a href="mailto:j@w1.fi">Jouni Malinen</a></address>
 <!-- Created: Sun Jan  2 17:20:17 PST 2005 -->
 <!-- hhmts start -->
-Last modified: Sun Mar  9 12:12:08 EET 2008
+Last modified: Sun Aug 10 20:31:07 EEST 2008
 <!-- hhmts end -->
     </div>
   </body>
diff --git a/www/index.html b/www/index.html
index 4b8cf8bef..f63ca0979 100644
--- a/www/index.html
+++ b/www/index.html
@@ -213,9 +213,9 @@ main kernel tree.
 </ul>
 <li>Latest development release:
 <ul>
-<li><a href="releases/hostapd-0.6.3.tar.gz">hostapd-0.6.3.tar.gz</a>
-<li><a href="releases/wpa_supplicant-0.6.3.tar.gz">wpa_supplicant-0.6.3.tar.gz</a> (source code for all versions)</li>
-<li><a href="releases/wpa_supplicant-windows-bin-0.6.3.zip">wpa_supplicant-windows-bin-0.6.3.zip</a> (binaries for Windows)</li>
+<li><a href="releases/hostapd-0.6.4.tar.gz">hostapd-0.6.4.tar.gz</a>
+<li><a href="releases/wpa_supplicant-0.6.4.tar.gz">wpa_supplicant-0.6.4.tar.gz</a> (source code for all versions)</li>
+<li><a href="releases/wpa_supplicant-windows-bin-0.6.4.zip">wpa_supplicant-windows-bin-0.6.4.zip</a> (binaries for Windows)</li>
 <li><a href="wpa_supplicant/qt4/wpa_gui-qt433-windows-dll.zip">wpa_gui-qt433-windows-dll.zip</a> (Qt4 libraries from wpa_gui/Windows)</li>
 </ul>
 <li>ChangeLog:
@@ -300,7 +300,7 @@ Internet Systems Consortium (ISC).
     <address><a href="mailto:j@w1.fi">Jouni Malinen</a></address>
 <!-- Created: Mon May 27 20:08:41 EEST 2002 -->
 <!-- hhmts start -->
-Last modified: Sat Feb 23 15:47:03 PST 2008
+Last modified: Sun Aug 10 20:30:19 EEST 2008
 <!-- hhmts end -->
     </div>
   </body>
diff --git a/www/versions.dot b/www/versions.dot
index 46e48a941..6d1f535d9 100644
--- a/www/versions.dot
+++ b/www/versions.dot
@@ -40,6 +40,7 @@ digraph versions {
 	v061 [label="0.6.1  hw\n2007-11-24"]
 	v062 [label="0.6.2  hw\n2008-01-01"]
 	v063 [label="0.6.3  hw\n2008-02-22"]
+	v064 [label="0.6.4  hw\n2008-08-10"]
 
 # stable releases
 
@@ -71,13 +72,13 @@ digraph versions {
 	v024 -> v030 -> v031 -> v032 -> v033 -> v034 -> v035 -> v036 -> v037
 	v037 -> v040 -> v041 -> v042 -> v043 -> v044 -> v045 -> v046 -> v047
 	v047 -> v050 -> v051 -> v052 -> v053 -> v054 -> v055 -> v056 -> v057
-	v057 -> v060 -> v061 -> v062 -> v063
+	v057 -> v060 -> v061 -> v062 -> v063 -> v064
 
 	{rank=same; v001 v024}
 	{rank=same; v030 v037}
 	{rank=same; v040 v047}
 	{rank=same; v050 v057}
-#	{rank=same; v060 v063}
+#	{rank=same; v060 v064}
 
 # stable releases
 
diff --git a/www/wpa_supplicant/index.html b/www/wpa_supplicant/index.html
index e63c58e71..fb7ba9b2d 100644
--- a/www/wpa_supplicant/index.html
+++ b/www/wpa_supplicant/index.html
@@ -185,8 +185,8 @@ has some more information about the Windows port of wpa_supplicant.</p>
 </ul>
 <li>Latest development release:
 <ul>
-<li><a href="../releases/wpa_supplicant-0.6.3.tar.gz">wpa_supplicant-0.6.3.tar.gz</a> (source code for all versions)</li>
-<li><a href="../releases/wpa_supplicant-windows-bin-0.6.3.zip">wpa_supplicant-windows-bin-0.6.3.zip</a> (binaries for Windows)</li>
+<li><a href="../releases/wpa_supplicant-0.6.4.tar.gz">wpa_supplicant-0.6.4.tar.gz</a> (source code for all versions)</li>
+<li><a href="../releases/wpa_supplicant-windows-bin-0.6.4.zip">wpa_supplicant-windows-bin-0.6.4.zip</a> (binaries for Windows)</li>
 <li><a href="qt4/wpa_gui-qt433-windows-dll.zip">wpa_gui-qt433-windows-dll.zip</a> (Qt4 libraries from wpa_gui/Windows)</li>
 </ul>
 <li>ChangeLog:
@@ -356,7 +356,7 @@ Internet Systems Consortium (ISC).
     <address><a href="mailto:j@w1.fi">Jouni Malinen</a></address>
 <!-- Created: Sat May 22 21:41:58 PDT 2004 -->
 <!-- hhmts start -->
-Last modified: Fri May 23 19:39:40 EEST 2008
+Last modified: Sun Aug 10 20:31:01 EEST 2008
 <!-- hhmts end -->
     </div>
   </body>