diff --git a/Samples/Universal/shorewall.conf b/Samples/Universal/shorewall.conf
index 3c4224430..8d5c753c6 100644
--- a/Samples/Universal/shorewall.conf
+++ b/Samples/Universal/shorewall.conf
@@ -136,8 +136,6 @@ FORWARD_CLEAR_MARK=
 
 IMPLICIT_CONTINUE=No
 
-HIGH_ROUTE_MARKS=No
-
 IP_FORWARDING=On
 
 KEEP_RT_TABLES=No
@@ -188,8 +186,6 @@ TRACK_PROVIDERS=Yes
 
 USE_DEFAULT_RT=No
 
-WIDE_TC_MARKS=Yes
-
 ZONE2ZONE=2
 
 ###############################################################################
diff --git a/Samples/one-interface/shorewall.conf b/Samples/one-interface/shorewall.conf
index 746d2acb1..996511040 100644
--- a/Samples/one-interface/shorewall.conf
+++ b/Samples/one-interface/shorewall.conf
@@ -147,8 +147,6 @@ FORWARD_CLEAR_MARK=
 
 IMPLICIT_CONTINUE=No
 
-HIGH_ROUTE_MARKS=No
-
 IP_FORWARDING=Off
 
 KEEP_RT_TABLES=No
@@ -199,8 +197,6 @@ TRACK_PROVIDERS=Yes
 
 USE_DEFAULT_RT=No
 
-WIDE_TC_MARKS=Yes
-
 ZONE2ZONE=2
 
 ###############################################################################
diff --git a/Samples/three-interfaces/shorewall.conf b/Samples/three-interfaces/shorewall.conf
index 8136c5cb3..66a62c6ac 100644
--- a/Samples/three-interfaces/shorewall.conf
+++ b/Samples/three-interfaces/shorewall.conf
@@ -145,8 +145,6 @@ FORWARD_CLEAR_MARK=
 
 IMPLICIT_CONTINUE=No
 
-HIGH_ROUTE_MARKS=No
-
 IP_FORWARDING=On
 
 KEEP_RT_TABLES=No
@@ -197,8 +195,6 @@ TRACK_PROVIDERS=Yes
 
 USE_DEFAULT_RT=No
 
-WIDE_TC_MARKS=Yes
-
 ZONE2ZONE=2
 
 ###############################################################################
diff --git a/Samples/two-interfaces/shorewall.conf b/Samples/two-interfaces/shorewall.conf
index 884183ee0..e3a559bfe 100644
--- a/Samples/two-interfaces/shorewall.conf
+++ b/Samples/two-interfaces/shorewall.conf
@@ -148,8 +148,6 @@ FORWARD_CLEAR_MARK=
 
 IMPLICIT_CONTINUE=No
 
-HIGH_ROUTE_MARKS=No
-
 IP_FORWARDING=On
 
 KEEP_RT_TABLES=No
@@ -200,8 +198,6 @@ TRACK_PROVIDERS=Yes
 
 USE_DEFAULT_RT=No
 
-WIDE_TC_MARKS=Yes
-
 ZONE2ZONE=2
 
 ###############################################################################
diff --git a/Samples6/Universal/shorewall6.conf b/Samples6/Universal/shorewall6.conf
index eba39e2a0..3d2f0c871 100644
--- a/Samples6/Universal/shorewall6.conf
+++ b/Samples6/Universal/shorewall6.conf
@@ -125,8 +125,6 @@ FASTACCEPT=Yes
 
 FORWARD_CLEAR_MARK=
 
-HIGH_ROUTE_MARKS=No
-
 IMPLICIT_CONTINUE=No
 
 IP_FORWARDING=Off
@@ -165,8 +163,6 @@ TRACK_PROVIDERS=Yes
 
 USE_DEFAULT_RT=No
 
-WIDE_TC_MARKS=Yes
-
 ZONE2ZONE=2
 
 ###############################################################################
diff --git a/Samples6/one-interface/shorewall6.conf b/Samples6/one-interface/shorewall6.conf
index fb32dded1..3e405fb8c 100644
--- a/Samples6/one-interface/shorewall6.conf
+++ b/Samples6/one-interface/shorewall6.conf
@@ -125,8 +125,6 @@ FASTACCEPT=No
 
 FORWARD_CLEAR_MARK=
 
-HIGH_ROUTE_MARKS=No
-
 IMPLICIT_CONTINUE=No
 
 IP_FORWARDING=Off
@@ -165,8 +163,6 @@ TRACK_PROVIDERS=Yes
 
 USE_DEFAULT_RT=No
 
-WIDE_TC_MARKS=Yes
-
 ZONE2ZONE=2
 
 ###############################################################################
diff --git a/Samples6/three-interfaces/shorewall6.conf b/Samples6/three-interfaces/shorewall6.conf
index a5e629e36..cfcab4ce1 100644
--- a/Samples6/three-interfaces/shorewall6.conf
+++ b/Samples6/three-interfaces/shorewall6.conf
@@ -125,8 +125,6 @@ FASTACCEPT=No
 
 FORWARD_CLEAR_MARK=
 
-HIGH_ROUTE_MARKS=No
-
 IMPLICIT_CONTINUE=No
 
 IP_FORWARDING=On
@@ -165,8 +163,6 @@ TRACK_PROVIDERS=Yes
 
 USE_DEFAULT_RT=No
 
-WIDE_TC_MARKS=Yes
-
 ZONE2ZONE=2
 
 ###############################################################################
diff --git a/Samples6/two-interfaces/shorewall6.conf b/Samples6/two-interfaces/shorewall6.conf
index d222f0ab8..39c2dec8e 100644
--- a/Samples6/two-interfaces/shorewall6.conf
+++ b/Samples6/two-interfaces/shorewall6.conf
@@ -125,8 +125,6 @@ FASTACCEPT=No
 
 FORWARD_CLEAR_MARK=
 
-HIGH_ROUTE_MARKS=No
-
 IMPLICIT_CONTINUE=No
 
 IP_FORWARDING=On
@@ -165,8 +163,6 @@ TRACK_PROVIDERS=Yes
 
 USE_DEFAULT_RT=No
 
-WIDE_TC_MARKS=Yes
-
 ZONE2ZONE=2
 
 ###############################################################################
diff --git a/Shorewall/configfiles/shorewall.conf b/Shorewall/configfiles/shorewall.conf
index 06fda99c0..186bde262 100644
--- a/Shorewall/configfiles/shorewall.conf
+++ b/Shorewall/configfiles/shorewall.conf
@@ -136,8 +136,6 @@ FORWARD_CLEAR_MARK=
 
 IMPLICIT_CONTINUE=No
 
-HIGH_ROUTE_MARKS=No
-
 IP_FORWARDING=On
 
 KEEP_RT_TABLES=No
@@ -188,8 +186,6 @@ TRACK_PROVIDERS=No
 
 USE_DEFAULT_RT=No
 
-WIDE_TC_MARKS=No
-
 ZONE2ZONE=2
 
 ###############################################################################
diff --git a/Shorewall6/configfiles/shorewall6.conf b/Shorewall6/configfiles/shorewall6.conf
index 1b31f3aa7..c939901ce 100644
--- a/Shorewall6/configfiles/shorewall6.conf
+++ b/Shorewall6/configfiles/shorewall6.conf
@@ -125,8 +125,6 @@ FASTACCEPT=No
 
 FORWARD_CLEAR_MARK=Yes
 
-HIGH_ROUTE_MARKS=No
-
 IMPLICIT_CONTINUE=No
 
 IP_FORWARDING=Off
@@ -165,8 +163,6 @@ TRACK_PROVIDERS=No
 
 USE_DEFAULT_RT=No
 
-WIDE_TC_MARKS=No
-
 ZONE2ZONE=2
 
 ###############################################################################
diff --git a/manpages/shorewall.conf.xml b/manpages/shorewall.conf.xml
index f88c454e5..8abfda79f 100644
--- a/manpages/shorewall.conf.xml
+++ b/manpages/shorewall.conf.xml
@@ -674,6 +674,9 @@ net     all  DROP   info</programlisting>then the chain name is 'net2all'
         role="bold">Yes</emphasis>|<emphasis role="bold">No</emphasis>}</term>
 
         <listitem>
+          <para>Deprecated in Shorewall 4.4.26 in favor of
+          PROVIDER_OFFSET.</para>
+
           <para>Prior to version 3.2.0, it was not possible to use connection
           marking in <ulink
           url="shorewall-tcrules.html">shorewall-tcrules</ulink>(5) if you had
@@ -2112,6 +2115,9 @@ net     all  DROP   info</programlisting>then the chain name is 'net2all'
         role="bold">Yes</emphasis>|<emphasis role="bold">No</emphasis>}</term>
 
         <listitem>
+          <para>Deprecated in Shorewall 4.4.26 in favor of TC_BITS and
+          MASK_BITS.</para>
+
           <para>When set to No (the default), traffic shaping marks are 8
           bytes wide (possible values are 1-255). When WIDE_TC_MARKS=Yes,
           traffic shaping marks are 14 bytes wide (values 1-16383). The
diff --git a/manpages6/shorewall6.conf.xml b/manpages6/shorewall6.conf.xml
index 5509d22af..b3a724513 100644
--- a/manpages6/shorewall6.conf.xml
+++ b/manpages6/shorewall6.conf.xml
@@ -583,6 +583,9 @@ net     all  DROP   info</programlisting>then the chain name is 'net2all'
         role="bold">Yes</emphasis>|<emphasis role="bold">No</emphasis>}</term>
 
         <listitem>
+          <para>Deprecated in Shorewall 4.4.26 in favor of
+          PROVIDER_OFFSET.</para>
+
           <para>You may set HIGH_ROUTE_MARKS=Yes in to effectively divide the
           packet mark and connection mark into two mark fields.</para>
 
@@ -1821,6 +1824,9 @@ net     all  DROP   info</programlisting>then the chain name is 'net2all'
         role="bold">Yes</emphasis>|<emphasis role="bold">No</emphasis>}</term>
 
         <listitem>
+          <para>Deprecated in Shorewall 4.4.26 in favor of TC_BITS and
+          MASK_BITS.</para>
+
           <para>When set to No (the default), traffic shaping marks are 8
           bytes wide (possible values are 1-255). When WIDE_TC_MARKS=Yes,
           traffic shaping marks are 14 bytes wide (values 1-16383). The