diff --git a/ChangeLog b/ChangeLog
index 84cd05dcc..972ad918f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,20 @@
 	* src/docgen/Pdfdoc.py: 0001055: Pictures of the gallery are not used in the
 	  detailed ancestor's report when output format is PDF
 
+2007-06-21  Alex Roitman  <shura@gramps-project.org>
+	* src/Editors/_EditFamily.py (EditFamily.__do_save): Disconnect
+	all signal handlers before committing data.
+	* src/GrampsCfg.py (cb_format_changed): Catch new exception;
+	escape special chars from displayed span.
+	* src/NameDisplay.py (_gen_cooked_func): Only replace known
+	parameters, leave the rest as is;
+	(_format_str_base): Catch formatting exceptions and raise our own.
+	* src/Errors.py (NameDisplayError): Add class. 
+
+2007-06-22  Zsolt Foldvari  <zfoldvar@users.sourceforge.net>
+	* src/NameDisplay.py: fix indentation (use only spaces).
+	* src/GrampsCfg.py: handle invalid name format: #1025.
+
 2007-06-20  Don Allingham  <don@gramps-project.org>
 	* src/DbManager.py: Catch the icons properly
 	* src/GrampsDb/_GrampsDBDir.py: catch error on lock file deletion