diff --git a/ChangeLog b/ChangeLog
index 6b689930c9..ea778b5d17 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2005-11-09  Kevin P. Fleming  <kpfleming@digium.com>
+
+	* channels/chan_iax2.c (update_registry): don't complain about unspecifed registration expiration intervals, just use the minimum
+
 2005-11-08  Kevin P. Fleming  <kpfleming@digium.com>
 
 	* Asterisk 1.2.0-rc1 released.
diff --git a/channels/chan_iax2.c b/channels/chan_iax2.c
index 093a4c231f..806b1d2ca3 100755
--- a/channels/chan_iax2.c
+++ b/channels/chan_iax2.c
@@ -5660,6 +5660,9 @@ static int update_registry(char *name, struct sockaddr_in *sin, int callno, char
 	/* Setup the expiry */
 	if (p->expire > -1)
 		ast_sched_del(sched, p->expire);
+	/* treat an unspecified refresh interval as the minimum */
+	if (!refresh)
+		refresh = min_reg_expire;
 	if (refresh > max_reg_expire) {
 		ast_log(LOG_NOTICE, "Restricting registration for peer '%s' to %d seconds (requested %d)\n",
 			p->name, max_reg_expire, refresh);