diff --git a/ChangeLog b/ChangeLog
index 8d6bd261af..e54b5b3582 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2003-09-30  Derek Atkins  <derek@ihtfp.com>
+
+	* src/engine/gnc-date.h: add a comment about minimum string length
+	* src/engine/Transaction.c: fix the ISO_DATELEN to be "long enough"
+	  Fixes #123558
+
 2003-09-18  Christian Stimming  <stimming@tuhh.de>
 
 	* configure.in: Add correct configure test for openhbci version
diff --git a/src/engine/Transaction.c b/src/engine/Transaction.c
index d844c181c9..35164a17f7 100644
--- a/src/engine/Transaction.c
+++ b/src/engine/Transaction.c
@@ -83,8 +83,7 @@ const char *void_former_notes_str = "void-former-notes";
 
 #define PRICE_SIGFIGS 6
 
-#define ISO_DATELENGTH 30 /* length of an iso 8601 date string.
-                           * not sure, can't be bothered counting :) */
+#define ISO_DATELENGTH 32 /* length of an iso 8601 date string. */
 
 /* This static indicates the debugging module that this .o belongs to.  */
 static short module = MOD_ENGINE;
diff --git a/src/engine/gnc-date.h b/src/engine/gnc-date.h
index c57bdefaa1..ee3158e477 100644
--- a/src/engine/gnc-date.h
+++ b/src/engine/gnc-date.h
@@ -189,7 +189,7 @@ Timespec gnc_iso8601_to_timespec_gmt(const char *);
 
 /** The gnc_timespec_to_iso8601_buff() routine prints a Timespec
 * as an ISO-8601 style string.  The buffer must be long enough
-* to contain the string.  The string is null-terminated. This
+* to contain the NULL-terminated string (32 characters + NUL).  This
 * routine returns a pointer to the null terminator (and can 
 * thus be used in the 'stpcpy' metaphor of string concatenation).*/
 char * gnc_timespec_to_iso8601_buff (Timespec ts, char * buff);