diff --git a/CHANGELOG b/CHANGELOG
index d845e58..8413b39 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,5 +1,19 @@
-Interim changes since NDN-CPP v0.2(2013-11-14)
-* http://redmine.named-data.net/issues/1056 Fix DTAG NDNProtocolDataUnit to encode as "NDN\202\000"
+Interim changes since NDN-CPP v0.2(2013-11-25)
+
+Bug fixes
+* http://redmine.named-data.net/issues/1056 Fix DTAG NDNProtocolDataUnit to encode as "NDN\202\000".
+* http://redmine.named-data.net/issues/1064 Add ax_lib_sqlite3.m4, etc. to m4 directory so that autogen.sh works out of the box.
+* http://redmine.named-data.net/issues/1077 Move the BasicIdentityStorage sqlite file to ~/.ndnx/ndnsec-identity.db .
+  NOTE: If you have an old file at ~/.ndn-identity/identity.db, please move it to ~/.ndnx/ndnsec-identity.db .
+* Fix bug in getForwardingEntryFlags: Need to check all flags, not the first flag using "else if".
+
+Changes
+* MetaInfo: Added setFinalBlockID for Name::Component, remove unused setFinalBlockID which take uint8_t*, etc.
+* Fix clang compiler warnings: Include headers, parentheses and cast explicitly.
+
+Documentation
+* Move instructions for running ./autogen.sh from configure.ac to the Development section of INSTALL.
+* http://redmine.named-data.net/issues/1072: In Doxyfile, fix EXCLUDE for ndnboost to new location include/ndnboost .
 
 NDN-CPP v0.2 (2013-11-08)
 
diff --git a/src/security/identity/basic-identity-storage.cpp b/src/security/identity/basic-identity-storage.cpp
index 67a68f0..85af9a9 100644
--- a/src/security/identity/basic-identity-storage.cpp
+++ b/src/security/identity/basic-identity-storage.cpp
@@ -100,10 +100,11 @@
     // Strip the ending '/'.
     homeDir.erase(homeDir.size() - 1);
   
-  string identityDir = homeDir + '/' + ".ndn-identity";
+  string identityDir = homeDir + '/' + ".ndnx";
+  // TODO: Handle non-unix file systems which don't have "mkdir -p".
   ::system(("mkdir -p " + identityDir).c_str());
   
-  int res = sqlite3_open((identityDir + '/' + "identity.db").c_str(), &database_);
+  int res = sqlite3_open((identityDir + '/' + "ndnsec-identity.db").c_str(), &database_);
 
   if (res != SQLITE_OK)
     throw SecurityException("identity DB cannot be opened/created");