diff --git a/Shorewall/changelog.txt b/Shorewall/changelog.txt
index f10064cf3..8c8f33039 100644
--- a/Shorewall/changelog.txt
+++ b/Shorewall/changelog.txt
@@ -4,6 +4,9 @@ Changes in Shorewall 4.4.18 Beta 2
 
 2)  Remove hardcoded 0.0.0.0/0 from Providers.pm
 
+3)  Correct an optimizer defect having to do with jumps containing a
+    comment.
+
 Changes in Shorewall 4.4.18 Beta 1
 
 1)  Split up modules file.
diff --git a/Shorewall/releasenotes.txt b/Shorewall/releasenotes.txt
index 34d386b4a..a6241b2e4 100644
--- a/Shorewall/releasenotes.txt
+++ b/Shorewall/releasenotes.txt
@@ -19,6 +19,13 @@ VI.   PROBLEMS CORRECTED AND NEW FEATURES IN PRIOR RELEASES
    produce an 'ip route add' command containing an IPv4 address. It now
    correctly uses the equivalent IPv6 address.
 
+2) When optimize level 4 was set, the optimizer mis-handled rules of the
+   form:
+
+	-A <chain1> -j <chain2> -m comment ...
+
+   when such a rule was the only rule in a chain.
+
 4.4.18 Beta 1
 
 None.