diff --git a/doc/install-guide/bk_openstackinstallguide.xml b/doc/install-guide/bk_openstackinstallguide.xml
index 83fe2690ba..53f06b173b 100644
--- a/doc/install-guide/bk_openstackinstallguide.xml
+++ b/doc/install-guide/bk_openstackinstallguide.xml
@@ -189,10 +189,10 @@
     <xi:include href="ch_clients.xml"/>
     <xi:include href="ch_glance.xml"/>
     <xi:include href="ch_nova.xml"/>
+    <xi:include href="ch_networking.xml"/>
     <xi:include href="ch_horizon.xml"/>
     <xi:include href="ch_cinder.xml"/>
     <xi:include href="ch_swift.xml"/>
-    <xi:include href="ch_neutron.xml"/>
     <xi:include href="ch_heat.xml"/>
     <xi:include href="ch_ceilometer.xml"/>
     <xi:include href="app_reserved_uids.xml"/>
diff --git a/doc/install-guide/ch_networking.xml b/doc/install-guide/ch_networking.xml
new file mode 100644
index 0000000000..e53b5437d3
--- /dev/null
+++ b/doc/install-guide/ch_networking.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<chapter xmlns="http://docbook.org/ns/docbook"
+  xmlns:xi="http://www.w3.org/2001/XInclude"
+  xmlns:xlink="http://www.w3.org/1999/xlink" version="5.0"
+  xml:id="ch_networking">
+  <title>Add a networking service</title>
+<!-- FIXME Temporarily replacing this warning.
+  <warning>
+    <para>This chapter is a bit more adventurous than we would
+      like. We are working on cleanup and improvements to it.
+      Like for the rest of the Installation Guide, feedback
+      through bug reports and patches to improve it are
+      welcome.</para>
+  </warning>
+-->
+  <warning>
+    <para>We are updating this material for Icehouse. You may find structure
+      and/or content issues during this process.</para>
+  </warning>
+  <section xml:id="section_neutron-networking">
+    <title>Networking (neutron)</title>
+    <xi:include href="section_neutron-concepts.xml"/>
+    <xi:include href="section_neutron-controller-node.xml"/>
+    <xi:include href="section_neutron-network-node.xml"/>
+    <xi:include href="section_neutron-compute-node.xml"/>
+    <xi:include href="section_neutron-initial-networks.xml"/>
+  </section>
+  <section xml:id="section_nova-networking">
+    <title>Legacy networking</title>
+    <xi:include href="section_nova-networking-compute-node.xml"/>
+  </section>
+</chapter>
diff --git a/doc/install-guide/ch_nova.xml b/doc/install-guide/ch_nova.xml
index 037a7023bf..95f33d8185 100644
--- a/doc/install-guide/ch_nova.xml
+++ b/doc/install-guide/ch_nova.xml
@@ -9,6 +9,6 @@
   <xi:include href="section_nova-controller.xml"/>
   <xi:include href="section_nova-compute.xml"/>
   <!--  <xi:include href="section_nova-kvm.xml"/>-->
-  <xi:include href="section_nova-network.xml"/>
+  <!-- <xi:include href="section_nova-network.xml"/> -->
   <xi:include href="section_nova-boot.xml"/>
 </chapter>
diff --git a/doc/install-guide/ch_overview.xml b/doc/install-guide/ch_overview.xml
index dbacaba753..ba20ff3a7b 100644
--- a/doc/install-guide/ch_overview.xml
+++ b/doc/install-guide/ch_overview.xml
@@ -83,7 +83,8 @@
         </itemizedlist>
         <note>
           <para>When you implement this architecture, skip
-            <xref linkend="ch_neutron" />. To use optional services, you
+            <xref linkend="section_neutron-networking" /> in
+            <xref linkend="ch_networking" />. To use optional services, you
             might need to install additional nodes, as described in
             subsequent chapters.</para>
         </note>
@@ -134,9 +135,10 @@
         </itemizedlist>
         <note>
           <para>When you implement this architecture, skip
-            <xref linkend="nova-network" /> in <xref linkend="ch_nova" />.
-            To use optional services, you might need to install additional
-            nodes, as described in subsequent chapters.</para>
+            <xref linkend="section_nova-networking" /> in
+            <xref linkend="ch_networking" />. To use optional services, you
+            might need to install additional nodes, as described in
+            subsequent chapters.</para>
         </note>
         <figure xml:id="example-architecture-with-neutron-networking">
           <title>Three-node architecture with OpenStack Networking (neutron)</title>
diff --git a/doc/install-guide/section_nova-network.xml b/doc/install-guide/section_nova-networking-compute-node.xml
similarity index 93%
rename from doc/install-guide/section_nova-network.xml
rename to doc/install-guide/section_nova-networking-compute-node.xml
index 5a2959173e..7a99c42485 100644
--- a/doc/install-guide/section_nova-network.xml
+++ b/doc/install-guide/section_nova-networking-compute-node.xml
@@ -17,19 +17,6 @@
     functionality across multiple hosts. As a result, no single
     network controller acts as a single point of failure. This process
     configures each compute node for networking.</para>
-  <note>
-    <para>Choose one of these options to configure networking in OpenStack:</para>
-    <itemizedlist>
-      <listitem>
-        <para>Legacy networking in OpenStack Compute, which is
-          described here.</para>
-      </listitem>
-      <listitem>
-        <para>The full software-defined networking stack. See <xref
-            linkend="ch_neutron"/>.</para>
-      </listitem>
-    </itemizedlist>
-  </note>
   <procedure>
     <step>
       <para>Install the appropriate packages for compute networking on the