diff --git a/Shorewall/Perl/Shorewall/Config.pm b/Shorewall/Perl/Shorewall/Config.pm
index eae0ef46b..7999df9c8 100644
--- a/Shorewall/Perl/Shorewall/Config.pm
+++ b/Shorewall/Perl/Shorewall/Config.pm
@@ -2298,52 +2298,52 @@ sub Logmark_Target() {
 }
 
 our %detect_capability =
-    ( NAT_ENABLED => \&Nat_Enabled,
-      MANGLE_ENABLED => \&Mangle_Enabled,
-      MULTIPORT => \&Multiport,
-      XMULTIPORT => \&Xmultiport,
-      CONNTRACK_MATCH => \&Conntrack_Match,
-      NEW_CONNTRACK_MATCH => \&New_Conntrack_Match,
-      OLD_CONNTRACK_MATCH => \&Old_Conntrack_Match,
-      USEPKTTYPE => \&Usepkttype,
-      POLICY_MATCH => \&Policy_Match,
-      PHYSDEV_MATCH => \&Physdev_Match,
-      PHYSDEV_BRIDGE => \&Physdev_Bridge,
-      LENGTH_MATCH => \&Length_Match,
-      IPRANGE_MATCH => \&IPRange_Match,
-      RECENT_MATCH => \&Recent_Match,
-      OWNER_MATCH => \&Owner_Match,
-      IPSET_MATCH => \&IPSet_Match,
-      CONNMARK => \&Connmark,
-      XCONNMARK => \&Xconnmark,
-      CONNMARK_MATCH => \&Connmark_Match,
-      XCONNMARK_MATCH => \&Xconnmark_Match,
-      RAW_TABLE => \&Raw_Table,
-      IPP2P_MATCH => \&Ipp2p_Match,
-      OLD_IPP2P_MATCH => \&Old_Ipp2p_Match,
+    ( ADDRTYPE => \&Addrtype,
       CLASSIFY_TARGET => \&Classify_Target,
-      ENHANCED_REJECT => \&Enhanced_Reject,
-      KLUDGEFREE => \&Kludgefree,
-      MARK => \&Mark,
-      XMARK => \&Xmark,
-      EXMARK => \&Exmark,
-      MANGLE_FORWARD => \&Mangle_Forward,
       COMMENTS => \&Comments,
-      ADDRTYPE => \&Addrtype,
-      TCPMSS_MATCH => \&Tcpmss_Match,
-      HASHLIMIT_MATCH => \&Hashlimit_Match,
-      NFQUEUE_TARGET => \&Nfqueue_Target,
-      REALM_MATCH => \&Realm_Match,
-      HELPER_MATCH => \&Helper_Match,
       CONNLIMIT_MATCH => \&Connlimit_Match,
-      TIME_MATCH => \&Time_Match,
+      CONNMARK => \&Connmark,
+      CONNMARK_MATCH => \&Connmark_Match,
+      CONNTRACK_MATCH => \&Conntrack_Match,
+      ENHANCED_REJECT => \&Enhanced_Reject,
+      EXMARK => \&Exmark,
       GOTO_TARGET => \&Goto_Target,
-      LOGMARK_TARGET => \&Logmark_Target,
+      HASHLIMIT_MATCH => \&Hashlimit_Match,
+      HELPER_MATCH => \&Helper_Match,
       IPMARK_TARGET => \&IPMark_Target,
-      TPROXY_TARGET => \&Tproxy_Target,
+      IPP2P_MATCH => \&Ipp2p_Match,
+      IPRANGE_MATCH => \&IPRange_Match,
+      IPSET_MATCH => \&IPSet_Match,
+      KLUDGEFREE => \&Kludgefree,
+      LENGTH_MATCH => \&Length_Match,
+      LOGMARK_TARGET => \&Logmark_Target,
       LOG_TARGET => \&Log_Target,
-      PERSISTENT_SNAT => \&Persistent_Snat,
+      MANGLE_ENABLED => \&Mangle_Enabled,
+      MANGLE_FORWARD => \&Mangle_Forward,
+      MARK => \&Mark,
+      MULTIPORT => \&Multiport,
+      NAT_ENABLED => \&Nat_Enabled,
+      NEW_CONNTRACK_MATCH => \&New_Conntrack_Match,
+      NFQUEUE_TARGET => \&Nfqueue_Target,
+      OLD_CONNTRACK_MATCH => \&Old_Conntrack_Match,
       OLD_HL_MATCH => \&Old_Hashlimit_Match,
+      OLD_IPP2P_MATCH => \&Old_Ipp2p_Match,
+      OWNER_MATCH => \&Owner_Match,
+      PERSISTENT_SNAT => \&Persistent_Snat,
+      PHYSDEV_BRIDGE => \&Physdev_Bridge,
+      PHYSDEV_MATCH => \&Physdev_Match,
+      POLICY_MATCH => \&Policy_Match,
+      RAW_TABLE => \&Raw_Table,
+      REALM_MATCH => \&Realm_Match,
+      RECENT_MATCH => \&Recent_Match,
+      TCPMSS_MATCH => \&Tcpmss_Match,
+      TIME_MATCH => \&Time_Match,
+      TPROXY_TARGET => \&Tproxy_Target,
+      USEPKTTYPE => \&Usepkttype,
+      XCONNMARK_MATCH => \&Xconnmark_Match,
+      XCONNMARK => \&Xconnmark,
+      XMARK => \&Xmark,
+      XMULTIPORT => \&Xmultiport,
     );
 
 sub detect_capability( $ ) {