diff --git a/Shorewall/Macros/macro.ICPV2 b/Shorewall/Macros/macro.ICPV2
new file mode 100644
index 000000000..d26e77ff9
--- /dev/null
+++ b/Shorewall/Macros/macro.ICPV2
@@ -0,0 +1,11 @@
+#
+# Shorewall version 4 - ICPV2 Macro
+#
+# /usr/share/shorewall/macro.ICPV2
+#
+#	This macro handles Internet Cache Protocol V2 (Squid) traffic
+#
+###############################################################################
+#ACTION	SOURCE	DEST	PROTO	DEST	SOURCE	RATE	USER/
+#				PORT(S)	PORT(S)	LIMIT	GROUP
+PARAM	-	-	udp	3130
diff --git a/Shorewall/Macros/macro.Squid b/Shorewall/Macros/macro.Squid
new file mode 100644
index 000000000..82c97b44d
--- /dev/null
+++ b/Shorewall/Macros/macro.Squid
@@ -0,0 +1,11 @@
+#
+# Shorewall version 4 - Squid Macro
+#
+# /usr/share/shorewall/macro.Squid
+#
+#	This macro handles Squid web proxy traffic
+#
+###############################################################################
+#ACTION	SOURCE	DEST	PROTO	DEST	SOURCE	RATE	USER/
+#				PORT(S)	PORT(S)	LIMIT	GROUP
+PARAM	-	-	tcp	3128
diff --git a/Shorewall/releasenotes.txt b/Shorewall/releasenotes.txt
index f72e6cd9b..2148b427e 100644
--- a/Shorewall/releasenotes.txt
+++ b/Shorewall/releasenotes.txt
@@ -100,8 +100,8 @@ RC 1
 
 	Long Name	Short Name	Number
         --------------------------------------
-	auth   		ah    		50
-	esp		esp		51
+	auth   		ah    		51
+	esp		esp		50
 	hop-by-hop	hop		0
 	route		ipv6-route	41
 	frag		ipv6-frag	44
diff --git a/manpages6/shorewall6-accounting.xml b/manpages6/shorewall6-accounting.xml
index 47baef7fa..fa94b733d 100644
--- a/manpages6/shorewall6-accounting.xml
+++ b/manpages6/shorewall6-accounting.xml
@@ -463,13 +463,13 @@
 
         <listitem>
           <para>The <replaceable>header-list</replaceable> consists of a
-          comma-separated list of headers from the following list. </para>
+          comma-separated list of headers from the following list.</para>
 
           <variablelist>
             <varlistentry>
               <term><emphasis role="bold">auth</emphasis>, <emphasis
               role="bold">ah</emphasis>, or <emphasis
-              role="bold">50</emphasis></term>
+              role="bold">51</emphasis></term>
 
               <listitem>
                 <para><firstterm>Authentication Headers</firstterm> extension
@@ -479,7 +479,7 @@
 
             <varlistentry>
               <term><emphasis role="bold">esp</emphasis>, or <emphasis
-              role="bold">51</emphasis></term>
+              role="bold">50</emphasis></term>
 
               <listitem>
                 <para><firstterm>Encrypted Security Payload</firstterm>
@@ -533,7 +533,7 @@
               role="bold">255</emphasis></term>
 
               <listitem>
-                <para>Any protocol header. </para>
+                <para>Any protocol header.</para>
               </listitem>
             </varlistentry>
           </variablelist>
diff --git a/manpages6/shorewall6-rules.xml b/manpages6/shorewall6-rules.xml
index a6eef6f0f..7c27fad64 100644
--- a/manpages6/shorewall6-rules.xml
+++ b/manpages6/shorewall6-rules.xml
@@ -944,7 +944,7 @@
             <varlistentry>
               <term><emphasis role="bold">auth</emphasis>, <emphasis
               role="bold">ah</emphasis>, or <emphasis
-              role="bold">50</emphasis></term>
+              role="bold">51</emphasis></term>
 
               <listitem>
                 <para><firstterm>Authentication Headers</firstterm> extension
@@ -954,7 +954,7 @@
 
             <varlistentry>
               <term><emphasis role="bold">esp</emphasis>, or <emphasis
-              role="bold">51</emphasis></term>
+              role="bold">50</emphasis></term>
 
               <listitem>
                 <para><firstterm>Encrypted Security Payload</firstterm>
diff --git a/manpages6/shorewall6-tcrules.xml b/manpages6/shorewall6-tcrules.xml
index 639e78d31..68892296a 100644
--- a/manpages6/shorewall6-tcrules.xml
+++ b/manpages6/shorewall6-tcrules.xml
@@ -614,7 +614,7 @@ SAME              $FW            0.0.0.0/0    tcp        80,443</programlisting>
             <varlistentry>
               <term><emphasis role="bold">auth</emphasis>, <emphasis
               role="bold">ah</emphasis>, or <emphasis
-              role="bold">50</emphasis></term>
+              role="bold">51</emphasis></term>
 
               <listitem>
                 <para><firstterm>Authentication Headers</firstterm> extension
@@ -624,7 +624,7 @@ SAME              $FW            0.0.0.0/0    tcp        80,443</programlisting>
 
             <varlistentry>
               <term><emphasis role="bold">esp</emphasis>, or <emphasis
-              role="bold">51</emphasis></term>
+              role="bold">50</emphasis></term>
 
               <listitem>
                 <para><firstterm>Encrypted Security Payload</firstterm>