diff --git a/ChangeLog.txt b/ChangeLog.txt
index 0b858ecc..80efb39e 100644
--- a/ChangeLog.txt
+++ b/ChangeLog.txt
@@ -86,6 +86,8 @@ Client library:
 - Wildcard TLS certificates are now supported.
 - mosquittopp now has a virtual destructor. Closes bug #452915.
 - Add support for MQTT v3.1.1.
+- Don't quit mosquitto_loop_forever() if broker not available on first
+  connect. Closes bug #453293, but requires more work.
 
 
 1.3.5 - 20141008
diff --git a/lib/mosquitto.c b/lib/mosquitto.c
index c449cc98..8497a92a 100644
--- a/lib/mosquitto.c
+++ b/lib/mosquitto.c
@@ -999,10 +999,11 @@ int mosquitto_loop_forever(struct mosquitto *mosq, int timeout, int max_packets)
 			case MOSQ_ERR_AUTH:
 			case MOSQ_ERR_ACL_DENIED:
 			case MOSQ_ERR_UNKNOWN:
-			case MOSQ_ERR_ERRNO:
 			case MOSQ_ERR_EAI:
 			case MOSQ_ERR_PROXY:
 				return rc;
+			case MOSQ_ERR_ERRNO:
+				break;
 		}
 		if(errno == EPROTO){
 			return rc;