diff --git a/CHANGELOG.md b/CHANGELOG.md
index d5921e7f..3f72de78 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,18 @@
+X.Y.Z Release notes
+=============================================================
+### Breaking changes
+* None.
+
+### Enhancements
+* None.
+
+### Bug fixes
+* Fix several cases where adding collection listeners from within a listener
+  callback would produce incorrect results.
+
+### Internal
+* None.
+
 2.0.1 Release notes (2017-10-23)
 =============================================================
 ### Breaking changes
diff --git a/src/object-store b/src/object-store
index 001dc5f8..d3ab265d 160000
--- a/src/object-store
+++ b/src/object-store
@@ -1 +1 @@
-Subproject commit 001dc5f8e5f2bb6ebb95f511339c347410710b6a
+Subproject commit d3ab265df6f810a739da91c2e782e0421fdeac9a