diff --git a/CHANGES b/CHANGES
index 287f74286d..f9151efd79 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,4 +1,8 @@
 
+2.1-1036 | 2013-08-05 17:29:11 -0400
+
+  * Fix the SSL infinite loop I just created. (Seth Hall)
+
 2.1-1035 | 2013-08-05 16:44:50 -0400
 
   * Change to SSL log delay to cause the log to write even if delay times out. (Seth Hall)
diff --git a/VERSION b/VERSION
index 491bca5672..1843674cb9 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-2.1-1035
+2.1-1036
diff --git a/scripts/base/protocols/ssl/main.bro b/scripts/base/protocols/ssl/main.bro
index 67293c5bca..2381b356e4 100644
--- a/scripts/base/protocols/ssl/main.bro
+++ b/scripts/base/protocols/ssl/main.bro
@@ -138,6 +138,7 @@ function log_record(info: Info)
 		timeout 15secs
 			{
 			# We are just going to log the record anyway.
+			delete info$delay_tokens;
 			log_record(info);
 			}
 		}