diff --git a/Shorewall2/changelog.txt b/Shorewall2/changelog.txt
index 59f5862f7..f8d061917 100644
--- a/Shorewall2/changelog.txt
+++ b/Shorewall2/changelog.txt
@@ -12,6 +12,8 @@ Changes in 2.2.2
 
 5) Add the output of 'arp -na' to the 'shorewall status' display.
 
+6) Provide support for the Extended multiport match available in 2.6.11.
+
 Changes in 2.2.1
 
 1) Add examples to the zones and policy files.
diff --git a/Shorewall2/firewall b/Shorewall2/firewall
index a20c4d9f7..82fdbd9be 100755
--- a/Shorewall2/firewall
+++ b/Shorewall2/firewall
@@ -5606,7 +5606,8 @@ report_capabilities() {
     echo "Shorewall has detected the following iptables/netfilter capabilities:"
     report_capability $NAT_ENABLED "NAT"
     report_capability $MANGLE_ENABLED "Packet Mangling"
-    [ -n "$XMULTIPORT" ] && report_capability $XMULTIPORT "Extended Multi-port Match" || report_capability $MULTIPORT "Multi-port Match"
+    report_capability $MULTIPORT "Multi-port Match"
+    [ -n "$MULTIPORT" ] && report_capability $XMULTIPORT "Extended Multi-port Match"
     report_capability $CONNTRACK_MATCH "Connection Tracking Match"
     report_capability $PKTTYPE "Packet Type Match"
     report_capability $POLICY_MATCH "Policy Match"