diff --git a/CHANGES b/CHANGES
index bd18f26349..e00ab793e7 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,4 +1,8 @@
 
+2.6-587 | 2019-07-11 12:13:48 -0700
+
+  * Fix a sign-compare compiler warning (Jon Siwek, Corelight)
+
 2.6-586 | 2019-07-11 11:15:40 -0700
 
   * Convert all JSON output to use an external library for better consistency (Tim Wojtulewicz, Corelight)
diff --git a/VERSION b/VERSION
index 4f1f474483..92fb39a4f0 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-2.6-586
+2.6-587
diff --git a/src/util.cc b/src/util.cc
index 9f51fc4b64..f2735ad29a 100644
--- a/src/util.cc
+++ b/src/util.cc
@@ -1911,7 +1911,7 @@ string json_escape_utf8(const string& val)
 
 		// The next bit is based on the table at https://en.wikipedia.org/wiki/UTF-8#Description.
 		// If next character is 11110xxx, this is a 4-byte UTF-8
-		int char_size = 0;
+		unsigned int char_size = 0;
 		if ( (val[idx] & 0xF8) == 0xF0 ) char_size = 4;
 		
 		// If next character is 1110xxxx, this is a 3-byte UTF-8