diff --git a/CHANGES b/CHANGES
index 5e5d425b26..07f2aefa93 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,4 +1,11 @@
 
+2.5-815 | 2018-08-06 17:07:56 -0500
+
+  * Fix an "uninitialized" compiler warning (Jon Siwek, Corelight)
+
+  * Fix (non)suppression of proxy-bound events in known-*.bro scripts
+    (Jon Siwek, Corelight)
+
 2.5-811 | 2018-08-03 11:33:57 -0500
 
   * Update scripts to use vector "+=" append operation (Vern Paxson, Corelight)
diff --git a/VERSION b/VERSION
index 6e9545e5f2..ff24872445 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-2.5-811
+2.5-815
diff --git a/src/Expr.cc b/src/Expr.cc
index c5f38841ee..f958c63ecf 100644
--- a/src/Expr.cc
+++ b/src/Expr.cc
@@ -882,7 +882,7 @@ Val* BinaryExpr::SetFold(Val* v1, Val* v2) const
 	TableVal* tv1 = v1->AsTableVal();
 	TableVal* tv2 = v2->AsTableVal();
 	TableVal* result;
-	bool res;
+	bool res = false;
 
 	switch ( tag ) {
 	case EXPR_AND: