diff --git a/doc/user-guide/bk-user-guide.xml b/doc/user-guide/bk-user-guide.xml
index bedf981157..ae71325a40 100644
--- a/doc/user-guide/bk-user-guide.xml
+++ b/doc/user-guide/bk-user-guide.xml
@@ -69,6 +69,6 @@
     <xi:include href="ch_overview.xml"/>
     <xi:include href="ch_dashboard.xml"/>
     <xi:include href="ch_cli.xml"/>
-    <xi:include href="../../common/app_command_reference.xml"/>
-    <xi:include href="../../common/ch_resources.xml"/>
+    <xi:include href="../common/app_command_reference.xml"/>
+    <xi:include href="../common/ch_resources.xml"/>
 </book>
diff --git a/doc/user-guide/ch_cli.xml b/doc/user-guide/ch_cli.xml
index a8b99e5c20..394c9268e5 100644
--- a/doc/user-guide/ch_cli.xml
+++ b/doc/user-guide/ch_cli.xml
@@ -9,25 +9,25 @@
     <info>
         <title>OpenStack command-line clients</title>
     </info>
-    <xi:include href="../../common/section_cli_overview.xml"/>
+    <xi:include href="../common/section_cli_overview.xml"/>
     <?hard-pagebreak?>
-    <xi:include href="../../common/section_cli_install.xml"/>
+    <xi:include href="../common/section_cli_install.xml"/>
     <?hard-pagebreak?>
-    <xi:include href="../../common/section_cli_version.xml"/>
+    <xi:include href="../common/section_cli_version.xml"/>
     <?hard-pagebreak?>
-    <xi:include href="../../common/section_cli_openrc.xml"/>
+    <xi:include href="../common/section_cli_openrc.xml"/>
     <?hard-pagebreak?>
     <xi:include
-        href="../../common/section_glance_cli_manage_images.xml"/>
+        href="../common/section_glance_cli_manage_images.xml"/>
     <?hard-pagebreak?>
     <xi:include href="section_nova_cli_configure_instances.xml"/>
     <?hard-pagebreak?>
-    <xi:include href="../../common/section_nova_cli_boot.xml"/>
+    <xi:include href="../common/section_nova_cli_boot.xml"/>
     <?hard-pagebreak?>
     <xi:include href="section_nova_cli_manage_instances.xml"/>
     <?hard-pagebreak?>
     <xi:include
-        href="../../common/section_neutron_cli_manage_networks.xml"/>
+        href="../common/section_neutron_cli_manage_networks.xml"/>
     <?hard-pagebreak?>
     <xi:include href="section_heat_cli.xml"/>
     <?hard-pagebreak?>
diff --git a/doc/user-guide/ch_dashboard.xml b/doc/user-guide/ch_dashboard.xml
index 7096904fd8..f2410d2260 100644
--- a/doc/user-guide/ch_dashboard.xml
+++ b/doc/user-guide/ch_dashboard.xml
@@ -14,7 +14,7 @@
         administrators. You can modify these examples to create other
         types and sizes of server instances.</para>
 <?hard-pagebreak?>
-    <xi:include href="../../common/section_dashboard_access.xml"/>
+    <xi:include href="../common/section_dashboard_access.xml"/>
     <?hard-pagebreak?>
     <xi:include
         href="section_dashboard_manage_images.xml"/>
diff --git a/doc/user-guide/ch_overview.xml b/doc/user-guide/ch_overview.xml
index 5563636633..ed6b971c97 100644
--- a/doc/user-guide/ch_overview.xml
+++ b/doc/user-guide/ch_overview.xml
@@ -47,5 +47,5 @@
     <para>To use the OpenStack APIs, it helps to be familiar with
         HTTP/1.1, RESTful web services, the OpenStack services, and
         JSON or XML data serialization formats.</para>
-    <xi:include href="../../common/section_dochistory.xml"/>
+    <xi:include href="../common/section_dochistory.xml"/>
 </preface>
diff --git a/doc/user-guide/pom.xml b/doc/user-guide/pom.xml
index e4e5bc198a..757761d9ac 100644
--- a/doc/user-guide/pom.xml
+++ b/doc/user-guide/pom.xml
@@ -61,7 +61,7 @@ set toc,title </generateToc>
           <highlightSource>false</highlightSource>
           <xincludeSupported>true</xincludeSupported>
           <showXslMessages>true</showXslMessages>
-          <sourceDirectory>src</sourceDirectory>
+          <sourceDirectory>.</sourceDirectory>
           <feedbackEmail>diane.fleming@rackspace.com</feedbackEmail>
           <security>external</security>
           <branding>openstack</branding>
diff --git a/doc/user-guide/section_dashboard_manage_images.xml b/doc/user-guide/section_dashboard_manage_images.xml
index ba1ea96d7b..f33850ed64 100644
--- a/doc/user-guide/section_dashboard_manage_images.xml
+++ b/doc/user-guide/section_dashboard_manage_images.xml
@@ -37,7 +37,7 @@
           <mediaobject>
             <imageobject>
               <imagedata
-                fileref="../../common/figures/user_image_create.png"
+                fileref="../common/figures/user_image_create.png"
                 format="PNG" width="4in" contentwidth="4in"/>
             </imageobject>
           </mediaobject>
diff --git a/doc/user-guide/section_dashboard_manage_instances.xml b/doc/user-guide/section_dashboard_manage_instances.xml
index b3e757186b..76d762d728 100644
--- a/doc/user-guide/section_dashboard_manage_instances.xml
+++ b/doc/user-guide/section_dashboard_manage_instances.xml
@@ -67,7 +67,7 @@
                         <mediaobject>
                             <imageobject>
                                 <imagedata
-                                   fileref="../../common/figures/change_instance_state.png"
+                                   fileref="../common/figures/change_instance_state.png"
                                    format="PNG" contentwidth="4in"/>
                             </imageobject>
                         </mediaobject>
diff --git a/doc/user-guide/section_nova_cli_config-drive.xml b/doc/user-guide/section_nova_cli_config-drive.xml
index 0c01cfb3ce..29b099fd8c 100644
--- a/doc/user-guide/section_nova_cli_config-drive.xml
+++ b/doc/user-guide/section_nova_cli_config-drive.xml
@@ -265,6 +265,6 @@ openstack/latest/user_data</computeroutput></screen>
         <title>Configuration Reference</title>
         <para>The following table shows all options for the config
             drive.</para>
-        <xi:include href="../../common/tables/nova-configdrive.xml"/>
+        <xi:include href="../common/tables/nova-configdrive.xml"/>
     </simplesect>
 </section>
diff --git a/doc/user-guide/section_nova_cli_manage_instances.xml b/doc/user-guide/section_nova_cli_manage_instances.xml
index ba5427bf25..4346dddde0 100644
--- a/doc/user-guide/section_nova_cli_manage_instances.xml
+++ b/doc/user-guide/section_nova_cli_manage_instances.xml
@@ -7,13 +7,13 @@
     <para>Instances are virtual machines that run inside the
         cloud.</para>
     <xi:include href="section_nova_cli_floating_ips.xml"/>
-    <xi:include href="../../common/section_nova_cli_resizerebuild.xml"/>
-    <xi:include href="../../common/section_nova_cli_startstop.xml"/>
-    <xi:include href="../../common/section_nova_cli_reboot.xml"/>
-    <xi:include href="../../common/section_nova_cli_evacuate.xml"/>
-    <xi:include href="../../common/section_nova_cli_terminate.xml"/>
-    <xi:include href="../../common/section_nova_cli_get_console.xml"/>
-    <xi:include href="../../common/section_nova_cli_baremetal.xml"/>
+    <xi:include href="../common/section_nova_cli_resizerebuild.xml"/>
+    <xi:include href="../common/section_nova_cli_startstop.xml"/>
+    <xi:include href="../common/section_nova_cli_reboot.xml"/>
+    <xi:include href="../common/section_nova_cli_evacuate.xml"/>
+    <xi:include href="../common/section_nova_cli_terminate.xml"/>
+    <xi:include href="../common/section_nova_cli_get_console.xml"/>
+    <xi:include href="../common/section_nova_cli_baremetal.xml"/>
     <xi:include
-        href="../../common/section_nova_cli_usage_statistics.xml"/>
+        href="../common/section_nova_cli_usage_statistics.xml"/>
 </section>