diff --git a/Shorewall2/changelog.txt b/Shorewall2/changelog.txt
index 56d978dbf..ef7c54a2a 100644
--- a/Shorewall2/changelog.txt
+++ b/Shorewall2/changelog.txt
@@ -15,3 +15,8 @@ Changes since 2.0.1
 7) Allow CONFIG_PATH to be inherited.
 
 8) Fix ensure_config_path call.
+
+9) Make LOCAL and ALL INTERFACES independent in the nat file.
+
+10) Add "ko.gz" to the vast list of module suffixes that distributions
+    have invented.
diff --git a/Shorewall2/firewall b/Shorewall2/firewall
index e11669d29..af17171f0 100755
--- a/Shorewall2/firewall
+++ b/Shorewall2/firewall
@@ -5874,7 +5874,7 @@ do_initialize() {
     BRIDGING=$(added_param_value_no BRIDGING $BRIDGING)
     DYNAMIC_ZONES=$(added_param_value_no DYNAMIC_ZONES $DYNAMIC_ZONES)
 
-    [ -n "$MODULE_SUFFIX" ] || MODULE_SUFFIX="o gz ko o.gz"
+    [ -n "$MODULE_SUFFIX" ] || MODULE_SUFFIX="o gz ko o.gz ko.gz"
 
     #
     # Strip the files that we use often
diff --git a/Shorewall2/releasenotes.txt b/Shorewall2/releasenotes.txt
index 1ee4bc895..a4211268d 100755
--- a/Shorewall2/releasenotes.txt
+++ b/Shorewall2/releasenotes.txt
@@ -54,5 +54,10 @@ New Features:
    Yes or yes. Now, the LOCAL columns contents are treated
    independently of the contents of the ALL INTERFACES column.
 
+4) The folks at Mandrake have nothing better to do than create yet
+   another kernel module naming convention. As a consequence,
+   beginning with this release, if MODULE_PREFIX isn't specified in
+   shorewall.conf, then the default value is "o gz ko o.gz ko.gz".
+
 
 
diff --git a/Shorewall2/shorewall.conf b/Shorewall2/shorewall.conf
index be538d3bc..637b173c6 100755
--- a/Shorewall2/shorewall.conf
+++ b/Shorewall2/shorewall.conf
@@ -528,9 +528,9 @@ BLACKLISTNEWONLY=Yes
 #
 # When loading a module named in /etc/shorewall/modules, Shorewall normally
 # looks in the MODULES DIRECTORY (see MODULESDIR above) for files whose names
-# end in ".o", ".ko", ".gz" or "o.gz". If your distribution uses a different
-# naming convention then you can specify the suffix (extension) for module 
-# names in this variable.
+# end in ".o", ".ko", ".gz", "o.gz" or "ko.gz" . If your distribution uses a
+# different naming convention then you can specify the suffix (extension) for
+# module names in this variable.
 #
 # To see what suffix is used by your distribution:
 #