diff --git a/doc/common/tables/cinder-xiv.xml b/doc/common/tables/cinder-xiv.xml
index 60781d7569..5c60a750fe 100644
--- a/doc/common/tables/cinder-xiv.xml
+++ b/doc/common/tables/cinder-xiv.xml
@@ -17,6 +17,22 @@
       <tr>
         <th colspan="2">[DEFAULT]</th>
       </tr>
+      <tr>
+        <td>san_clustername = </td>
+        <td>(StrOpt) Cluster name to use for creating volumes</td>
+      </tr>
+      <tr>
+        <td>san_ip = </td>
+        <td>(StrOpt) IP address of SAN controller</td>
+      </tr>
+      <tr>
+        <td>san_login = admin</td>
+        <td>(StrOpt) Username for SAN controller</td>
+      </tr>
+      <tr>
+        <td>san_password = </td>
+        <td>(StrOpt) Password for SAN controller</td>
+      </tr>
       <tr>
         <td>xiv_chap = disabled</td>
         <td>(StrOpt) CHAP authentication mode, effective only for iscsi (disabled|enabled)</td>
diff --git a/doc/config-reference/block-storage/drivers/ibm-xiv-volume-driver.xml b/doc/config-reference/block-storage/drivers/ibm-xiv-volume-driver.xml
index 5b8dbf080b..1fb4a38b05 100644
--- a/doc/config-reference/block-storage/drivers/ibm-xiv-volume-driver.xml
+++ b/doc/config-reference/block-storage/drivers/ibm-xiv-volume-driver.xml
@@ -2,13 +2,29 @@
     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">
-    <title>IBM XIV/DS8K volume driver</title>
-    <para>There is a unified volume back-end for IBM XIV and DS8K storage.
-    Set the following in your
-    <filename>cinder.conf</filename>, and use the following options to configure it.
-   </para>
-    <programlisting language="ini">
-    volume_driver=cinder.volume.drivers.xiv_ds8k.XIVDS8KDriver
-    </programlisting>
+    <title>IBM XIV and DS8000 volume driver</title>
+
+    <para>
+      The IBM Storage Driver for OpenStack is a Block Storage driver
+      that supports IBM XIV and IBM DS8000 storage systems over Fiber
+      channel and iSCSI.
+    </para>
+    <para>
+      Set the following in your <filename>cinder.conf</filename>, and
+      use the following options to configure it.
+    </para>
+    <programlisting language="ini">volume_driver = cinder.volume.drivers.xiv_ds8k.XIVDS8KDriver</programlisting>
     <xi:include href="../../../common/tables/cinder-xiv.xml"/>
+
+    <note>
+      <para>
+        To use the IBM Storage Driver for OpenStack you must download
+        and install the package available at:
+        <link xlink:href="http://www.ibm.com/support/fixcentral/swg/selectFixes?parent=Enterprise%2BStorage%2BServers&amp;product=ibm/Storage_Disk/XIV+Storage+System+%282810,+2812%29&amp;release=All&amp;platform=All&amp;function=all">http://www.ibm.com/support/fixcentral/swg/selectFixes?parent=Enterprise%2BStorage%2BServers&amp;product=ibm/Storage_Disk/XIV+Storage+System+%282810,+2812%29&amp;release=All&amp;platform=All&amp;function=all</link>
+      </para>
+    </note>
+
+    <para>For full documentation refer to IBM's online documentation
+    available at <link xlink:href="http://pic.dhe.ibm.com/infocenter/strhosts/ic/topic/com.ibm.help.strghosts.doc/nova-homepage.html">http://pic.dhe.ibm.com/infocenter/strhosts/ic/topic/com.ibm.help.strghosts.doc/nova-homepage.html</link>.
+    </para>
 </section>
diff --git a/tools/autogenerate-config-flagmappings/cinder.flagmappings b/tools/autogenerate-config-flagmappings/cinder.flagmappings
index 72c6823e45..04747971b1 100644
--- a/tools/autogenerate-config-flagmappings/cinder.flagmappings
+++ b/tools/autogenerate-config-flagmappings/cinder.flagmappings
@@ -280,11 +280,11 @@ rpc_zmq_matchmaker rpc
 rpc_zmq_port rpc
 rpc_zmq_topic_backlog rpc
 run_external_periodic_tasks common
-san_clustername san
-san_ip san prophetstor_dpl
+san_clustername san xip
+san_ip san prophetstor_dpl xip
 san_is_local san
-san_login san prophetstor_dpl
-san_password san prophetstor_dpl
+san_login san prophetstor_dpl xip
+san_password san prophetstor_dpl xip
 san_private_key san
 san_ssh_port san
 san_thin_provision san prophetstor_dpl