diff --git a/Shorewall/changelog.txt b/Shorewall/changelog.txt
index 4767a8d2d..139f27047 100644
--- a/Shorewall/changelog.txt
+++ b/Shorewall/changelog.txt
@@ -2,6 +2,8 @@ Changes in Shorewall 4.4.17 RC 1
 
 1)  Documentation and release notes cleanup.
 
+2)  Ensure that manual and accounting chains aren't too long.
+
 Changes in Shorewall 4.4.17 Beta 3
 
 1)  Allow run-time address variables in the masq file.
diff --git a/Shorewall/releasenotes.txt b/Shorewall/releasenotes.txt
index 371d47c6b..424505b53 100644
--- a/Shorewall/releasenotes.txt
+++ b/Shorewall/releasenotes.txt
@@ -16,7 +16,10 @@ VI.   PROBLEMS CORRECTED AND NEW FEATURES IN PRIOR RELEASES
 
 RC 1
 
-None.
+1)  Previously, Shorewall did not check the length of the names of
+    accounting chains and manual chains. This could result in 
+    errors when loading the resulting ruleset. Now, the compiler issues
+    an error for chain names longer than 29 characters.
 
 Beta 3
 
diff --git a/docs/ManualChains.xml b/docs/ManualChains.xml
index 9e7cfd29a..ef856c317 100644
--- a/docs/ManualChains.xml
+++ b/docs/ManualChains.xml
@@ -56,7 +56,8 @@
         can call later using Embedded PERL. These functions create a
         <firstterm>manual chain</firstterm> using
         Shorewall::Chains::new_manual_chain() and populate it with rules using
-        Shorewall::Chains::add_rule().</para>
+        Shorewall::Chains::add_rule(). The name passed to new_manual_chain()
+        must not be longer than 29 characters.</para>
       </listitem>
 
       <listitem>
diff --git a/manpages/shorewall-accounting.xml b/manpages/shorewall-accounting.xml
index 2fb816ce6..db3c75524 100644
--- a/manpages/shorewall-accounting.xml
+++ b/manpages/shorewall-accounting.xml
@@ -73,7 +73,8 @@
                 chain specified in the CHAIN column. If <emphasis
                 role="bold">:COUNT</emphasis> is included, a counting rule
                 matching this entry will be added to
-                <emphasis>chain</emphasis></para>
+                <emphasis>chain</emphasis>. The <emphasis>chain</emphasis> may
+                not exceed 29 characters in length.</para>
               </listitem>
             </varlistentry>
 
@@ -158,7 +159,8 @@
           role="bold">accounting</emphasis> chain is assumed. This is the
           chain where the accounting rule is added. The
           <emphasis>chain</emphasis> will be created if it doesn't already
-          exist.</para>
+          exist. The <emphasis>chain</emphasis> may not exceed 29 characters
+          in length.</para>
         </listitem>
       </varlistentry>
 
diff --git a/manpages6/shorewall6-accounting.xml b/manpages6/shorewall6-accounting.xml
index 0c8ad7fe9..d8928d6fb 100644
--- a/manpages6/shorewall6-accounting.xml
+++ b/manpages6/shorewall6-accounting.xml
@@ -73,7 +73,8 @@
                 chain specified in the CHAIN column. If <emphasis
                 role="bold">:COUNT</emphasis> is included, a counting rule
                 matching this entry will be added to
-                <emphasis>chain</emphasis></para>
+                <emphasis>chain</emphasis>. The <emphasis>chain</emphasis> may
+                not exceed 29 characters in length.</para>
               </listitem>
             </varlistentry>
 
@@ -111,7 +112,8 @@
           role="bold">accounting</emphasis> chain is assumed. This is the
           chain where the accounting rule is added. The
           <emphasis>chain</emphasis> will be created if it doesn't already
-          exist.</para>
+          exist. The <emphasis>chain</emphasis> may not exceed 29 characters
+          in length.</para>
         </listitem>
       </varlistentry>