diff --git a/Shorewall/Perl/Shorewall/Tunnels.pm b/Shorewall/Perl/Shorewall/Tunnels.pm
index 9b79eaac4..6139d5474 100644
--- a/Shorewall/Perl/Shorewall/Tunnels.pm
+++ b/Shorewall/Perl/Shorewall/Tunnels.pm
@@ -253,6 +253,7 @@ sub setup_tunnels() {
 			    'ipip'          => { function => \&setup_one_other,          params   => [ \@source, \@dest , 4 ] } ,
 			    'gre'           => { function => \&setup_one_other,          params   => [ \@source, \@dest , 47 ] } ,
 			    '6to4'          => { function => \&setup_one_other,          params   => [ \@source, \@dest , 41 ] } ,
+			    '6in4'          => { function => \&setup_one_other,          params   => [ \@source, \@dest , 41 ] } ,
 			    'pptpclient'    => { function => \&setup_pptp_client,        params   => [ $kind, \@source, \@dest ] } ,
 			    'pptpserver'    => { function => \&setup_pptp_server,        params   => [ $kind, \@source, \@dest ] } ,
 			    'openvpn'       => { function => \&setup_one_openvpn,        params   => [ $kind, \@source, \@dest ] } ,
diff --git a/manpages/shorewall-tunnels.xml b/manpages/shorewall-tunnels.xml
index bcd5954c0..f3f4f026a 100644
--- a/manpages/shorewall-tunnels.xml
+++ b/manpages/shorewall-tunnels.xml
@@ -55,7 +55,9 @@
         <listitem>
           <para>Types are as follows:</para>
 
-          <programlisting>        <emphasis role="bold">6to4</emphasis>          - 6to4 or 6in4 tunnel         
+          <programlisting>        <emphasis role="bold">6to4</emphasis> or <emphasis
+              role="bold">6in4</emphasis>  - 6to4 or 6in4 tunnel. The <emphasis
+              role="bold">6in4</emphasis> synonym was added in 4.4.24.        
         <emphasis role="bold">ipsec</emphasis>         - IPv4 IPSEC
         <emphasis role="bold">ipsecnat</emphasis>      - IPv4 IPSEC with NAT Traversal (UDP port 4500 encapsulation)
         <emphasis role="bold">ipip</emphasis>          - IPv4 encapsulated in IPv4 (Protocol 4)
@@ -111,14 +113,6 @@
         </listitem>
       </varlistentry>
 
-      <varlistentry>
-        <term></term>
-
-        <listitem>
-          <para></para>
-        </listitem>
-      </varlistentry>
-
       <varlistentry>
         <term><emphasis role="bold">ZONE</emphasis> -
         <emphasis>zone</emphasis></term>