diff --git a/ChangeLog b/ChangeLog
index a39e054206..7907df2bc6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2000-08-23  Dave Peticolas  <dave@krondo.com>
+
+	* src/calculation/expression_parser.c: use glib memory routines.
+	(exit_parser): fix a bug where pe->named_vars was freed twice.
+
 2000-08-22  Dave Peticolas  <dave@krondo.com>
 
 	* src/engine/Transaction.c (xaccSplitSetBaseValue): check to
diff --git a/HACKING b/HACKING
index 0d5382c21c..948d2dc5df 100644
--- a/HACKING
+++ b/HACKING
@@ -26,7 +26,9 @@ General:
  * When creating a new file, the style of existing files should be
    followed.
 
- * When creating lots of new files in a new directory, use the GNU
+ * When creating lots of new files in a new directory, you may use
+   your own coding standards, but please try to stick as closely as
+   possible to the GNU coding standards.
 
  * Do not submit patches that consist of (gratuitous) stylistic changes.