diff --git a/CHANGELOG.md b/CHANGELOG.md
index b119e18..0c565a0 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,8 +4,11 @@ This project follows [semantic versioning](http://semver.org).
 
 
 ### UNRELEASED
-- Calling sodiumoxide::init for faster algorithms and thread safety (not needed)
-- Locking local repository to avoid index corruption
+- [added] Added CHANGELOG
+- [added] Locking local repository to avoid index corruption
+- [fixed] Creating empty bundle cache on init to avoid warninigs
+- [fixed] Calling sodiumoxide::init for faster algorithms and thread safety (not needed)
+
 
 ### v0.1.0 (2017-04-11)
 First working alpha release
diff --git a/src/bundledb/db.rs b/src/bundledb/db.rs
index 55a3bc9..0608331 100644
--- a/src/bundledb/db.rs
+++ b/src/bundledb/db.rs
@@ -200,6 +200,8 @@ impl BundleDb {
         try!(fs::create_dir_all(layout.remote_bundles_path()).context(&layout.remote_bundles_path() as &Path));
         try!(fs::create_dir_all(layout.local_bundles_path()).context(&layout.local_bundles_path() as &Path));
         try!(fs::create_dir_all(layout.temp_bundles_path()).context(&layout.temp_bundles_path() as &Path));
+        try!(StoredBundle::save_list_to(&[], layout.local_bundle_cache_path()));
+        try!(StoredBundle::save_list_to(&[], layout.remote_bundle_cache_path()));
         Ok(())
     }