diff --git a/Shorewall/Perl/Shorewall/Compiler.pm b/Shorewall/Perl/Shorewall/Compiler.pm
index 2c164e72b..2a9ffb911 100644
--- a/Shorewall/Perl/Shorewall/Compiler.pm
+++ b/Shorewall/Perl/Shorewall/Compiler.pm
@@ -782,7 +782,7 @@ sub compiler {
 	#
 	generate_matrix;
 
-	if ( $config{OPTIMIZE} & 0xD ) {
+	if ( $config{OPTIMIZE} & 0xE ) {
 	    progress_message2 'Optimizing Ruleset...';
 	    #
 	    # Optimize Policy Chains
@@ -851,7 +851,7 @@ sub compiler {
 	    #
 	    generate_matrix;
 
-	    if ( $config{OPTIMIZE} & 6 ) {
+	    if ( $config{OPTIMIZE} & 0xE ) {
 		progress_message2 'Optimizing Ruleset...';
 		#
 		# Optimize Policy Chains
@@ -860,7 +860,7 @@ sub compiler {
 		#
 		# Ruleset Optimization
 		#
-		optimize_ruleset if $config{OPTIMIZE} & 4;
+		optimize_ruleset if $config{OPTIMIZE} & 0xC;
 	    }
 
 	    enable_script if $debug;
diff --git a/Shorewall/changelog.txt b/Shorewall/changelog.txt
index 463a6d7e2..60c1f1b2a 100644
--- a/Shorewall/changelog.txt
+++ b/Shorewall/changelog.txt
@@ -4,6 +4,8 @@ Changes in Shorewall 4.4.17 Beta 1
 
 2)  Fix empty SHELL variable handling with bash.
 
+3)  Correct 'check -r' with OPTIMIZE=8
+
 Changes in Shorewall 4.4.17 Beta 1
 
 1)  Improve readability of logging logic in expand_rule().
diff --git a/Shorewall/releasenotes.txt b/Shorewall/releasenotes.txt
index 4f92cb791..2868c64c0 100644
--- a/Shorewall/releasenotes.txt
+++ b/Shorewall/releasenotes.txt
@@ -28,6 +28,11 @@ Beta 2
     variable was referenced in a config file on a system where /bin/sh
     is the Bourne Again Shell (bash).
 
+4)  In earlier versions. if OPTIMIZE=8 then the ruleset displayed by
+    'check -r' was the same as when OPTIMIZE=0
+    (unoptimized). Similarly, if OPTIMIZE=9 then the ruleset displayed
+    was the same as when OPTIMIZE=1. 
+
 Beta 1
 
 1)  Previously, a 'done.' message could be printed at the end of