diff --git a/ChangeLog.txt b/ChangeLog.txt
index 64957061..9894f09a 100644
--- a/ChangeLog.txt
+++ b/ChangeLog.txt
@@ -2,6 +2,7 @@ Version 0.10.0 (unreleased)
 ---------------
 New Features:
 * Integrity checks ensure you notice when someone modifies your file system.
+* File system nodes (files, directories, symlinks) store a parent pointer to the directory that contains them. This information can be used to resolve synchronization conflicts.
 
 Version 0.9.5 (unreleased)
 ---------------