diff --git a/ChangeLog b/ChangeLog
index 6129e13..95d549e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2010-12-04  NIIBE Yutaka  <gniibe@fsij.org>
+
+	* src/flash.c (flash_keystore_release): Reset keystore storage.
+
 2010-12-03  NIIBE Yutaka  <gniibe@fsij.org>
 
 	Keystore management changes.
diff --git a/src/flash.c b/src/flash.c
index 0ad23e1..66f2bc8 100644
--- a/src/flash.c
+++ b/src/flash.c
@@ -426,6 +426,7 @@ flash_keystore_release (void)
 #if FLASH_KEYSTORE_SIZE > FLASH_PAGE_SIZE
   flash_erase_page ((uint32_t)keystore_pool + FLASH_PAGE_SIZE);
 #endif
+  keystore = keystore_pool;
 }
 
 void