diff --git a/ChangeLog.txt b/ChangeLog.txt
index e64cf37c..cbe6ae2c 100644
--- a/ChangeLog.txt
+++ b/ChangeLog.txt
@@ -8,6 +8,9 @@ Broker:
 - Fix include_dir not sorting config files before loading. This was partially
   fixed in 1.5 previously.
 
+Build:
+- Don't require C99 compiler.
+
 
 1.5.6 - 20190206
 ================
diff --git a/src/persist.c b/src/persist.c
index 2f400869..13b34d2c 100644
--- a/src/persist.c
+++ b/src/persist.c
@@ -720,6 +720,7 @@ static int persist__msg_store_chunk_restore(struct mosquitto_db *db, FILE *db_fp
 	struct mosquitto_msg_store *stored = NULL;
 	struct mosquitto_msg_store_load *load;
 	char *err;
+	int i;
 
 	payload.ptr = NULL;
 
@@ -749,7 +750,7 @@ static int persist__msg_store_chunk_restore(struct mosquitto_db *db, FILE *db_fp
 		read_e(db_fptr, &i16temp, sizeof(uint16_t));
 		source_port = ntohs(i16temp);
 		if(source_port){
-			for(int i=0; i<db->config->listener_count; i++){
+			for(i=0; i<db->config->listener_count; i++){
 				if(db->config->listeners[i].port == source_port){
 					source.listener = &db->config->listeners[i];
 					break;