diff --git a/CHANGES b/CHANGES
index 0996de7c65..b40fc5320e 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,4 +1,8 @@
 
+1.6-dev-1118 | 2011-08-18 14:11:55 -0700
+
+  * Fixing key size calculation in composite hash code. (Robin Sommer)
+
 1.6-dev-1116 | 2011-08-18 10:05:07 -0700
 
   * Remove the 'net' type from Bro (addresses #535).
diff --git a/VERSION b/VERSION
index 6787f59c82..3ae78180ad 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-1.6-dev-1116
+1.6-dev-1118
diff --git a/src/CompHash.cc b/src/CompHash.cc
index 8a5b17aff6..28dfe54ad5 100644
--- a/src/CompHash.cc
+++ b/src/CompHash.cc
@@ -393,7 +393,7 @@ int CompositeHash::SingleTypeKeySize(BroType* bt, const Val* v,
 
 				sz = SingleTypeKeySize(rt->FieldType(i),
 						       rv ? rv->Lookup(i) : 0,
-						       type_check, sz, optional);
+						       type_check, sz, v && optional);
 				if ( ! sz )
 					return 0;
 				}