diff --git a/Shorewall/releasenotes.txt b/Shorewall/releasenotes.txt
index ba111179a..800f7b34e 100644
--- a/Shorewall/releasenotes.txt
+++ b/Shorewall/releasenotes.txt
@@ -310,7 +310,7 @@ None.
         or 'optional interface, you can then disable automatic firewall
         startup at boot time.
 
-	On Debian-based systems, set start=0 in /etc/default/<product>.
+	On Debian-based systems, set startup=0 in /etc/default/<product>.
 
 	On other systems, use your service startup configuration tool
 	(chkconfig, insserv, ...) to disable startup. 
diff --git a/docs/FAQ.xml b/docs/FAQ.xml
index 69f25c7fe..eb8667209 100644
--- a/docs/FAQ.xml
+++ b/docs/FAQ.xml
@@ -2061,6 +2061,18 @@ shorewall status &gt; /dev/null 2&gt;&amp;1 || shorewall start # Start Shorewall
           <para>Be sure to secure the script for execute access.</para>
         </listitem>
       </itemizedlist>
+
+      <variablelist>
+        <varlistentry>
+          <term>Update:</term>
+
+          <listitem>
+            <para>Beginning with Shorewall 4.4.10, there is a new <ulink
+            url="Manpages/shorewall-init.html">Shorewall Init Package</ulink>
+            that is designed to handle this case.</para>
+          </listitem>
+        </varlistentry>
+      </variablelist>
     </section>
 
     <section id="faq87">
diff --git a/docs/MultiISP.xml b/docs/MultiISP.xml
index 70aa51135..b8c873423 100644
--- a/docs/MultiISP.xml
+++ b/docs/MultiISP.xml
@@ -1214,6 +1214,13 @@ net      eth1         detect          <emphasis role="bold">optional</emphasis><
           they offer you a place to start.</para>
         </important>
 
+        <important>
+          <para>If you have installed Shorewall-init, you should disable its
+          ifup/ifdown/NetworkManager integration (set IFUPDOWN=0 in the <ulink
+          url="Manpages/shorewall-init.html">Shorewall-init configuration
+          file</ulink>).</para>
+        </important>
+
         <para>The script should be copied to a directory on root's PATH such
         as <filename>/usr/local/sbin/</filename>.</para>
 
@@ -1376,6 +1383,13 @@ fi</programlisting></para>
         more sophisticated monitoring than the simple swping script described
         in the preceding section.</para>
 
+        <important>
+          <para>If you have installed Shorewall-init, you should disable its
+          ifup/ifdown/NetworkManager integration (set IFUPDOWN=0 in the <ulink
+          url="Manpages/shorewall-init.html">Shorewall-init configuration
+          file</ulink>) before installing LSM.</para>
+        </important>
+
         <para>Like many Open Source products, LSM is poorly documented. It's
         main configuration file is normally kept in
         <filename>/etc/lsm/lsm.conf</filename>, but the file's name is passed