diff --git a/postfix/HISTORY b/postfix/HISTORY
index ebca95e2d..01b764542 100644
--- a/postfix/HISTORY
+++ b/postfix/HISTORY
@@ -8692,6 +8692,20 @@ Apologies for any names omitted.
 	with incorrectly implemented SQL or LDAP tables. File:
 	global/maps_find.c.
 
+20031023
+
+	Bugfix: the MYSQL and PGSQL modules invoked dict_register().
+	This was fixed a while ago but never made it into the
+	distribution. Files: util/dict*sql.c.
+
+	Robustness: added three ISSPACE() calls in the smtpd proxy
+	parser. File: smtpd/smtpd_proxy.c.
+
+20031024
+
+	Portability: added localhost to mydestination for sites that
+	turn off append_dot_mydomain. File: global/mail_params.h.
+
 Open problems:
 
 	High: when virtual aliasing is turned off after content
diff --git a/postfix/src/global/mail_params.h b/postfix/src/global/mail_params.h
index af146e1c3..81256e336 100644
--- a/postfix/src/global/mail_params.h
+++ b/postfix/src/global/mail_params.h
@@ -87,7 +87,7 @@ extern char *var_myorigin;
   * mail to other destinations.
   */
 #define VAR_MYDEST		"mydestination"
-#define DEF_MYDEST		"$myhostname, localhost.$mydomain"
+#define DEF_MYDEST		"$myhostname, localhost.$mydomain localhost"
 extern char *var_mydest;
 
  /*
diff --git a/postfix/src/smtpd/smtpd_check.c b/postfix/src/smtpd/smtpd_check.c
index 368ee31a3..9b583e129 100644
--- a/postfix/src/smtpd/smtpd_check.c
+++ b/postfix/src/smtpd/smtpd_check.c
@@ -3812,6 +3812,8 @@ char   *smtpd_check_size(SMTPD_STATE *state, off_t size)
 	|| BLOCKS(var_message_limit) >= fsbuf.block_free / 2) {
 	(void) smtpd_check_reject(state, MAIL_ERROR_RESOURCE,
 				  "452 Insufficient system storage");
+	msg_warn("not enough free space in mail queue: %lu bytes",
+		 (unsigned long) fsbuf.block_free * fsbuf.block_size);
 	return (STR(error_text));
     }
     return (0);
diff --git a/postfix/src/smtpd/smtpd_proxy.c b/postfix/src/smtpd/smtpd_proxy.c
index f7d2ae1bd..ec532dddd 100644
--- a/postfix/src/smtpd/smtpd_proxy.c
+++ b/postfix/src/smtpd/smtpd_proxy.c
@@ -1,6 +1,6 @@
 /*++
 /* NAME
-/*	smtpd_proto 3
+/*	smtpd_proxy 3
 /* SUMMARY
 /*	SMTP server pass-through proxy client
 /* SYNOPSIS
@@ -234,7 +234,8 @@ int     smtpd_proxy_open(SMTPD_STATE *state, const char *service,
      */
     lines = STR(state->proxy_buffer);
     while ((line = mystrtok(&lines, "\n")) != 0)
-	if ((line[3] == ' ' || line[3] == '-')
+	if (ISDIGIT(line[0]) && ISDIGIT(line[1]) && ISDIGIT(line[2])
+	    && (line[3] == ' ' || line[3] == '-')
 	    && strcmp(line + 4, XLOGINFO_CMD) == 0)
 	    (void) smtpd_proxy_cmd(state, SMTPD_PROX_WANT_ANY, "%s %s %s",
 				   XLOGINFO_CMD, state->addr, state->name);
diff --git a/postfix/src/util/dict_mysql.c b/postfix/src/util/dict_mysql.c
index 65eab343e..3c27b0023 100644
--- a/postfix/src/util/dict_mysql.c
+++ b/postfix/src/util/dict_mysql.c
@@ -382,7 +382,6 @@ DICT   *dict_mysql_open(const char *name, int open_flags, int dict_flags)
 				    dict_mysql->name->len_hosts);
     if (dict_mysql->pldb == NULL)
 	msg_fatal("couldn't intialize pldb!\n");
-    dict_register(name, (DICT *) dict_mysql);
     return (DICT_DEBUG (&dict_mysql->dict));
 }
 
diff --git a/postfix/src/util/dict_pgsql.c b/postfix/src/util/dict_pgsql.c
index 35117b690..4e1dc3a97 100644
--- a/postfix/src/util/dict_pgsql.c
+++ b/postfix/src/util/dict_pgsql.c
@@ -512,7 +512,6 @@ DICT   *dict_pgsql_open(const char *name, int open_flags, int dict_flags)
     dict_pgsql->dict.flags = dict_flags | DICT_FLAG_FIXED;
     if (dict_pgsql->pldb == NULL)
 	msg_fatal("couldn't intialize pldb!\n");
-    dict_register(name, (DICT *) dict_pgsql);
     return &dict_pgsql->dict;
 }