diff --git a/CHANGES b/CHANGES
index 05784ddcb3..62509f10f2 100755
--- a/CHANGES
+++ b/CHANGES
@@ -7,6 +7,10 @@
     -- We now ensure buffer policy is restored after RAS is done with a channel.
        This could cause audio problems on the channel after zapras is done
        with it. 
+ -- logger
+    -- The Asterisk logger will automatically detect when a log file needs to
+       be rotated.  However, this feature could put Asterisk in a nasty loop
+       that would result in a crash.
  -- general
     -- Added man pages for astgenkey, autosupport, and safe_asterisk
 
diff --git a/logger.c b/logger.c
index c8d504d741..51862c1ee2 100755
--- a/logger.c
+++ b/logger.c
@@ -358,6 +358,8 @@ int reload_logger(int rotate)
 
 	ast_mutex_unlock(&loglock);
 
+	pending_logger_reload = 0;
+
 	queue_log_init();
 
 	if (eventlog) {
@@ -369,7 +371,7 @@ int reload_logger(int rotate)
 	} else 
 		ast_log(LOG_ERROR, "Unable to create event log: %s\n", strerror(errno));
 	init_logger_chain();
-	pending_logger_reload = 0;
+	
 	return -1;
 }