diff --git a/doc/install-guide/ch_cinder.xml b/doc/install-guide/ch_cinder.xml
index 0938534eb5..3db320e50b 100644
--- a/doc/install-guide/ch_cinder.xml
+++ b/doc/install-guide/ch_cinder.xml
@@ -4,6 +4,12 @@
          xmlns:xlink="http://www.w3.org/1999/xlink" version="5.0"
          xml:id="ch_cinder">
   <title>Adding Block Storage</title>
-
-  <para>FIXME</para>
+       <para>The OpenStack Block Storage service works though the interaction of a series of daemon
+              processes named cinder-* that reside persistently on the host machine or machines. The
+              binaries can all be run from a single node, or spread across multiple nodes. They can
+              also be run on the same node as other OpenStack services. The following sections
+              explain the Block Storage components as well as how to configure and install Block
+              Storage.</para>
+  <xi:include href="../common/section_getstart_block-storage.xml"/>
+  <xi:include href="section_cinder-node.xml"/>
 </chapter>
diff --git a/doc/install-guide/section_cinder-install.xml b/doc/install-guide/section_cinder-install.xml
index d9f1565430..a151481762 100644
--- a/doc/install-guide/section_cinder-install.xml
+++ b/doc/install-guide/section_cinder-install.xml
@@ -4,21 +4,18 @@
     xmlns:xi="http://www.w3.org/2001/XInclude"
     xmlns:xlink="http://www.w3.org/1999/xlink"
     version="5.0">
-    <title>Installing and configuring Block Storage (Cinder)</title>
-    <para>Install the packages for OpenStack Block Storage (Cinder) on the cloud
-        controller.</para>
-    <screen os="ubuntu"><prompt>$</prompt> <userinput>sudo apt-get install cinder-api \
-        cinder-scheduler cinder-volume open-iscsi python-cinderclient tgt</userinput></screen>
-    <screen os="rhel;centos;fedora"><prompt>$</prompt> <userinput>sudo yum install openstack-cinder openstack-cinder-doc \
-        iscsi-initiator-utils scsi-target-utils</userinput></screen>
-    <screen os="opensuse"><prompt>$</prompt> <userinput>sudo zypper install openstack-cinder openstack-cinder-doc \
-        open-iscsi tgt</userinput></screen>
+    <title>Installing and configuring Block Storage</title>
+    <para>Install the packages for OpenStack Block Storage on the cloud controller.</para>
+    <screen os="ubuntu;debian"><prompt>#</prompt> <userinput>apt-get install cinder-api cinder-scheduler cinder-volume</userinput></screen>
+    <screen os="centos;rhel;fedora"><prompt>#</prompt> <userinput>yum install openstack-cinder openstack-utils openstack-selinux</userinput></screen>
+    <screen os="opensuse"><prompt>#</prompt> <userinput>zypper install  openstack-cinder-api openstack-cinder-scheduler \
+openstack-cinder-volume</userinput></screen>
     <note><para>If you are using XenServer type vhd images, you will also need the <command>vhd-util</command>
     binary to be able to create volumes from uploaded images.</para>
     <para>This could be installed by:</para>
-    <screen os="ubuntu"><prompt>$</prompt> <userinput>sudo apt-get install blktap-utils</userinput></screen>
-    <screen os="opensuse"><prompt>$</prompt> <userinput>sudo zypper in xen-tools</userinput></screen>
-    <screen os="rhel;centos;fedora"><prompt>$</prompt> <userinput>sudo yum install blktap</userinput></screen>
+    <screen os="ubuntu"><prompt>#</prompt> <userinput>apt-get install blktap-utils</userinput></screen>
+    <screen os="opensuse"><prompt>#</prompt> <userinput>zypper in xen-tools</userinput></screen>
+    <screen os="rhel;centos;fedora"><prompt>#</prompt> <userinput>yum install blktap</userinput></screen>
     </note>
 
     <para>Edit <filename>/etc/cinder/api-paste.ini</filename> (filter
diff --git a/doc/install-guide/section_cinder-node.xml b/doc/install-guide/section_cinder-node.xml
new file mode 100644
index 0000000000..1af9f69a00
--- /dev/null
+++ b/doc/install-guide/section_cinder-node.xml
@@ -0,0 +1,41 @@
+<section 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="cinder-node">
+  <title>Configuring a Block Storage Node</title>
+
+  <para>After configuring the services on the controller node, configure a second system to
+    be a Block Storage node.</para>
+
+  <para>The Block Storage Service relies on a driver for a particular
+  storage system. OpenStack can use various systemes, but this guide uses
+  LVM.</para>
+  <procedure>
+    <title>Configure a Block Storage Node</title>
+    <step><para>Begin by configuring the system using the instructions in
+      <xref linkend="ch_basics"/>. Note the following differences from the
+      controller node:</para>
+      <itemizedlist>
+        <listitem>
+          <para>Set the hostname to <literal>block1</literal>. Ensure that the
+            IP addresses and hostnames for both nodes are listed in the
+            <filename>/etc/hosts</filename> file on each system.</para>
+        </listitem>
+        <listitem>
+          <para>Follow the instructions in
+            <xref linkend="basics-ntp"/> to synchronize from the controller node.</para>
+        </listitem>
+      </itemizedlist>
+    </step>
+
+    <step><para>After configuring the operating system, install the appropriate
+      packages for the block storage service.</para>
+      <!-- FIXME: Double check list of packages for ubuntu fedora -->
+      <screen os="ubuntu;debian"><prompt>#</prompt> <userinput>apt-get install cinder-api cinder-scheduler cinder-volume</userinput></screen>
+      <screen os="centos;rhel;fedora"><prompt>#</prompt> <userinput>yum install openstack-cinder openstack-utils openstack-selinux</userinput></screen>
+      <screen os="opensuse"><prompt>#</prompt> <userinput>zypper install  openstack-cinder-api openstack-cinder-scheduler \
+ openstack-cinder-volume</userinput></screen>
+    </step>
+      </procedure>
+ </section>