diff --git a/ChangeLog b/ChangeLog
index 3e5b1289e207b6cd62be5360b0b91913d552b2df..13224e6e115a48901bb23d8817facc805e6f223c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,16 @@
+1999-10-09  David Byers  <davby@ida.liu.se>
+
+	* doc/Protocol-A.texi (Client-Specific Aux-Item Types): Added
+	komimportmail to reserved range.
+
+	* run-support/aux-items.conf: Fixed date validation regexp.
+
+1999-08-13  David Byers  <davby@ida.liu.se>
+
+	* doc/Protocol-A.texi (Predefined Aux-Item Types): Changed "of" to 
+	"or" in documentation of content-type. The old wording was
+	incorrect and conveyed the wrong idea.
+
 1999-09-19  Per Cederqvist  <ceder@lysator.liu.se>
 
 	Prepare for dbck improvement.
diff --git a/doc/Protocol-A.texi b/doc/Protocol-A.texi
index 5203b3406bb0a18af9f52c2fbfe433c15ab8c170..df9e90711784f8e8760c2d11410410acaee4e8ce 100644
--- a/doc/Protocol-A.texi
+++ b/doc/Protocol-A.texi
@@ -2,7 +2,7 @@
 @c
 @c FIXME: Explain how the garb works with nice and keep-commented
 @c
-@c $Id: Protocol-A.texi,v 1.93 1999/08/18 11:15:48 ceder Exp $
+@c $Id: Protocol-A.texi,v 1.94 1999/10/09 17:01:52 byers Exp $
 @c %**start of header
 @setfilename protocol-a.info
 @settitle LysKOM Protocol A
@@ -838,7 +838,7 @@ return an error (illegal-aux-item.)
 
 @table @samp
 @item content-type [1] (text)
-Specifies the content type of a text. Data is a valid MIME type of one
+Specifies the content type of a text. Data is a valid MIME type or one
 of the special LysKOM types (@pxref{LysKOM Content Types}.)
 
 This item may only be set by the author of a text. The inherit, secret
@@ -1191,6 +1191,7 @@ client or in an unassigned range. Assigned ranges will never change.
 Currently, the following ranges are assigned to clients:
 @itemize @bullet
 @item 10000-10099: The Elisp Client
+@item 10100-10199: komimportmail
 @end itemize
 
 If you want a range of numbers, send e-mail to the LysKOM development
diff --git a/run-support/aux-items.conf b/run-support/aux-items.conf
index f8896799d456025593d4521083fdd06105418ec6..f975c3e201c547cba1ddfb1d42227397d52b0e65 100644
--- a/run-support/aux-items.conf
+++ b/run-support/aux-items.conf
@@ -1,5 +1,5 @@
 # 
-# $Id: aux-items.conf,v 1.10 1999/07/25 11:24:01 kent Exp $
+# $Id: aux-items.conf,v 1.11 1999/10/09 17:01:55 byers Exp $
 # Copyright (C) 1994-1999  Lysator Academic Computer Association.
 # 
 # This file is part of the LysKOM server.
@@ -305,7 +305,7 @@
     author-only     = true;
     unique          = true;
     inherit         = false;
-    validate        = "[0-9][0-9][0-9][0-9]-[0-9][0-9]-[0-9][0-9] [0-9][0-9]:[0-9][0-9]:[0-9][0-9]\\( [-+][0-9][0-9][0-9][0-9]\\)?";
+    validate        = "[0-9][0-9][0-9][0-9]-[0-9][0-9]-[0-9][0-9] [0-9][0-9]:[0-9][0-9]:[0-9][0-9]( [-+][0-9][0-9][0-9][0-9])?";
 }
 
 #