diff --git a/doc/docbkx/README.rst b/doc/docbkx/README.rst
new file mode 100644
index 000000000..ce7529807
--- /dev/null
+++ b/doc/docbkx/README.rst
@@ -0,0 +1,31 @@
+================================
+Building the user and admin docs
+================================
+
+This documentation should eventually end up in the OpenStack documentation
+repositories `api-site` and `openstack-manuals`.
+
+Dependencies
+============
+
+on Ubuntu:
+
+  sudo apt-get install maven
+
+on Fedora Core:
+
+  sudo yum install maven
+
+Use `mvn`
+=========
+
+Build the REST API reference manual:
+
+  cd api-ref
+  mvn clean generate-sources
+
+Build the Heat admin guide:
+
+  cd senlin-admin
+  mvn clean generate-sources
+
diff --git a/doc/docbkx/senlin-admin/app_core.xml b/doc/docbkx/senlin-admin/app_core.xml
new file mode 100644
index 000000000..e1901b176
--- /dev/null
+++ b/doc/docbkx/senlin-admin/app_core.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE appendix [
+<!-- Some useful entities borrowed from HTML -->
+<!ENTITY ndash  "&#x2013;">
+<!ENTITY mdash  "&#x2014;">
+<!ENTITY hellip "&#x2026;">
+<!ENTITY plusmn "&#xB1;">
+
+]>
+<appendix 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="app_core">
+    <title>Core Configuration File Options</title>
+    <para>TODO</para>
+</appendix>
diff --git a/doc/docbkx/senlin-admin/bk-senlin-admin-guide.xml b/doc/docbkx/senlin-admin/bk-senlin-admin-guide.xml
new file mode 100644
index 000000000..801af3d44
--- /dev/null
+++ b/doc/docbkx/senlin-admin/bk-senlin-admin-guide.xml
@@ -0,0 +1,69 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE book[
+        <!-- Some useful entities borrowed from HTML -->
+        <!ENTITY ndash  "&#x2013;">
+        <!ENTITY mdash  "&#x2014;">
+        <!ENTITY hellip "&#x2026;">
+        <!ENTITY plusmn "&#xB1;">
+
+]>
+<book xmlns="http://docbook.org/ns/docbook"
+    xmlns:xlink="http://www.w3.org/1999/xlink"
+    xmlns:xi="http://www.w3.org/2001/XInclude"
+    xmlns:svg="http://www.w3.org/2000/svg"
+    xmlns:m="http://www.w3.org/1998/Math/MathML"
+    xmlns:html="http://www.w3.org/1999/xhtml"
+    xmlns:db="http://docbook.org/ns/docbook"
+    version="5.0"
+    status="final"
+    xml:id="Senlin-admin-guide-trunk">
+    <?rax pdf.url="../bk-heat-admin-guide-trunk.pdf"?>
+    <title>Senlin Administration Guide</title>
+    <info>
+        <author>
+            <personname>
+                <firstname/>
+                <surname/>
+            </personname>
+        </author>
+        <copyright>
+            <year>2015</year>
+            <holder>OpenStack</holder>
+        </copyright>
+        <releaseinfo>Kilo (2015.1)</releaseinfo>
+        <productname>Senlin</productname>
+        <pubdate>2014-12-10</pubdate>
+        <legalnotice role="apache2">
+            <annotation>
+                <remark>Copyright details are filled in by the template.</remark>
+            </annotation>
+        </legalnotice>
+        <abstract>
+            <para>This document is intended for administrators interested in running the Senlin Service. </para>
+        </abstract>
+
+        <revhistory>
+                <!-- ... continue adding more revisions here as you change this document using the markup shown below... -->
+            <revision>
+                <date>2012-12-14</date>
+                <revdescription>
+                    <itemizedlist spacing="compact">
+                        <listitem>
+                            <para>First edition of this document.</para>
+                        </listitem>
+                    </itemizedlist>
+                </revdescription>
+            </revision>
+
+
+        </revhistory>
+    </info>
+    <xi:include href="ch_preface.xml"/>
+    <xi:include href="ch_overview.xml"/>
+    <xi:include href="ch_install.xml"/>
+    <xi:include href="ch_using.xml"/>
+    <xi:include href="ch_limitations.xml"/>
+    <xi:include href="app_core.xml"/>
+
+
+</book>
diff --git a/doc/docbkx/senlin-admin/ch_install.xml b/doc/docbkx/senlin-admin/ch_install.xml
new file mode 100644
index 000000000..dce01810a
--- /dev/null
+++ b/doc/docbkx/senlin-admin/ch_install.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE chapter[
+<!-- Some useful entities borrowed from HTML -->
+<!ENTITY ndash  "&#x2013;">
+<!ENTITY mdash  "&#x2014;">
+<!ENTITY hellip "&#x2026;">
+<!ENTITY plusmn "&#xB1;">
+
+]>
+<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_install">
+    <title>Senlin Installation</title>
+    <para> This chapter describes how to install the Senlin Service
+        and get it up and running. </para>
+</chapter>
diff --git a/doc/docbkx/senlin-admin/ch_limitations.xml b/doc/docbkx/senlin-admin/ch_limitations.xml
new file mode 100644
index 000000000..b057431f4
--- /dev/null
+++ b/doc/docbkx/senlin-admin/ch_limitations.xml
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE chapter [
+<!-- Some useful entities borrowed from HTML -->
+<!ENTITY ndash  "&#x2013;">
+<!ENTITY mdash  "&#x2014;">
+<!ENTITY hellip "&#x2026;">
+<!ENTITY plusmn "&#xB1;">
+
+<!-- Useful for describing APIs -->
+<!ENTITY GET    '<command xmlns="http://docbook.org/ns/docbook">GET</command>'>
+<!ENTITY PUT    '<command xmlns="http://docbook.org/ns/docbook">PUT</command>'>
+<!ENTITY POST   '<command xmlns="http://docbook.org/ns/docbook">POST</command>'>
+<!ENTITY DELETE '<command xmlns="http://docbook.org/ns/docbook">DELETE</command>'>
+
+<!ENTITY CHECK  '<inlinemediaobject xmlns="http://docbook.org/ns/docbook">
+<imageobject role="fo">
+<imagedata fileref="figures/Check_mark_23x20_02.svg"
+format="SVG" scale="60"/>
+</imageobject>
+<imageobject role="html">
+<imagedata fileref="../figures/Check_mark_23x20_02.png"
+format="PNG" />
+</imageobject>
+</inlinemediaobject>'>
+
+<!ENTITY ARROW  '<inlinemediaobject xmlns="http://docbook.org/ns/docbook">
+<imageobject role="fo">
+<imagedata fileref="figures/Arrow_east.svg"
+format="SVG" scale="60"/>
+</imageobject>
+<imageobject role="html">
+<imagedata fileref="../figures/Arrow_east.png"
+format="PNG" />
+</imageobject>
+</inlinemediaobject>'>
+]>
+<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_limitations">
+    <title>Limitations</title>
+    <para>TODO</para>
+</chapter>
diff --git a/doc/docbkx/senlin-admin/ch_overview.xml b/doc/docbkx/senlin-admin/ch_overview.xml
new file mode 100644
index 000000000..920a5f6c9
--- /dev/null
+++ b/doc/docbkx/senlin-admin/ch_overview.xml
@@ -0,0 +1,57 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE chapter [
+<!-- Some useful entities borrowed from HTML -->
+<!ENTITY ndash  "&#x2013;">
+<!ENTITY mdash  "&#x2014;">
+<!ENTITY hellip "&#x2026;">
+<!ENTITY plusmn "&#xB1;">
+
+<!-- Useful for describing APIs -->
+<!ENTITY GET    '<command xmlns="http://docbook.org/ns/docbook">GET</command>'>
+<!ENTITY PUT    '<command xmlns="http://docbook.org/ns/docbook">PUT</command>'>
+<!ENTITY POST   '<command xmlns="http://docbook.org/ns/docbook">POST</command>'>
+<!ENTITY DELETE '<command xmlns="http://docbook.org/ns/docbook">DELETE</command>'>
+
+<!ENTITY CHECK  '<inlinemediaobject xmlns="http://docbook.org/ns/docbook">
+<imageobject role="fo">
+<imagedata fileref="figures/Check_mark_23x20_02.svg"
+format="SVG" scale="60"/>
+</imageobject>
+<imageobject role="html">
+<imagedata fileref="../figures/Check_mark_23x20_02.png"
+format="PNG" />
+</imageobject>
+</inlinemediaobject>'>
+
+<!ENTITY ARROW  '<inlinemediaobject xmlns="http://docbook.org/ns/docbook">
+<imageobject role="fo">
+<imagedata fileref="figures/Arrow_east.svg"
+format="SVG" scale="60"/>
+</imageobject>
+<imageobject role="html">
+<imagedata fileref="../figures/Arrow_east.png"
+format="PNG" />
+</imageobject>
+</inlinemediaobject>'>
+<!ENTITY SENova 'services extension'>
+<!ENTITY uSENova 'Services extension'>
+<!ENTITY uuSENova 'Services Extension'>
+<!ENTITY RSNova 'reset state extension'>
+<!ENTITY uRSNova 'Reset state extension'>
+<!ENTITY uuRSNova 'Reset State Extension'>
+<!ENTITY ngCS 'next generation Rackspace Cloud Servers™ <link
+                        xlink:href="http://www.rackspace.com/cloud/openstack/"
+                        >powered by OpenStack</link>'>
+<!ENTITY ungCS 'Next generation Rackspace Cloud Servers™ <link
+                        xlink:href="http://www.rackspace.com/cloud/openstack/"
+                        >powered by OpenStack</link>'>
+]>
+<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_overview">
+    <title>Overview</title>
+    <para> This chapter describes the high-level concepts and
+        components of a Senlin deployment. </para>
+
+</chapter>
diff --git a/doc/docbkx/senlin-admin/ch_preface.xml b/doc/docbkx/senlin-admin/ch_preface.xml
new file mode 100644
index 000000000..2da181299
--- /dev/null
+++ b/doc/docbkx/senlin-admin/ch_preface.xml
@@ -0,0 +1,68 @@
+<!DOCTYPE preface [
+<!-- Some useful entities borrowed from HTML -->
+<!ENTITY ndash  "&#x2013;">
+<!ENTITY mdash  "&#x2014;">
+<!ENTITY hellip "&#x2026;">
+<!ENTITY plusmn "&#xB1;">
+
+<!-- Useful for describing APIs -->
+<!ENTITY GET    '<command xmlns="http://docbook.org/ns/docbook">GET</command>'>
+<!ENTITY PUT    '<command xmlns="http://docbook.org/ns/docbook">PUT</command>'>
+<!ENTITY POST   '<command xmlns="http://docbook.org/ns/docbook">POST</command>'>
+<!ENTITY DELETE '<command xmlns="http://docbook.org/ns/docbook">DELETE</command>'>
+
+<!ENTITY CHECK  '<inlinemediaobject xmlns="http://docbook.org/ns/docbook">
+<imageobject role="fo">
+<imagedata fileref="figures/Check_mark_23x20_02.svg"
+format="SVG" scale="60"/>
+</imageobject>
+<imageobject role="html">
+<imagedata fileref="../figures/Check_mark_23x20_02.png"
+format="PNG" />
+</imageobject>
+</inlinemediaobject>'>
+
+<!ENTITY ARROW  '<inlinemediaobject xmlns="http://docbook.org/ns/docbook">
+<imageobject role="fo">
+<imagedata fileref="figures/Arrow_east.svg"
+format="SVG" scale="60"/>
+</imageobject>
+<imageobject role="html">
+<imagedata fileref="../figures/Arrow_east.png"
+format="PNG" />
+</imageobject>
+</inlinemediaobject>'>
+<!ENTITY SENova 'services extension'>
+<!ENTITY uSENova 'Services extension'>
+<!ENTITY uuSENova 'Services Extension'>
+<!ENTITY RSNova 'reset state extension'>
+<!ENTITY uRSNova 'Reset state extension'>
+<!ENTITY uuRSNova 'Reset State Extension'>
+<!ENTITY ngCS 'next generation Rackspace Cloud Servers™ <link
+                        xlink:href="http://www.rackspace.com/cloud/openstack/"
+                        >powered by OpenStack</link>'>
+<!ENTITY ungCS 'Next generation Rackspace Cloud Servers™ <link
+                        xlink:href="http://www.rackspace.com/cloud/openstack/"
+                        >powered by OpenStack</link>'>
+]>
+<preface 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_preface">
+    <title>Preface</title>
+    <section xml:id="Intended_Audience-d1e85">
+        <title>Intended Audience</title>
+        <para>TODO</para>
+    </section>
+    <section xml:id="Document_Change_History-d1e118">
+        <title>Document Change History</title>
+        <para>The most recent changes are described in the table
+            below:</para>
+        <?rax revhistory?>
+    </section>
+    <section xml:id="resources">
+        <title>Resources</title>
+        <para>TODO</para>
+    </section>
+    <?hard-pagebreak?>
+</preface>
diff --git a/doc/docbkx/senlin-admin/ch_using.xml b/doc/docbkx/senlin-admin/ch_using.xml
new file mode 100644
index 000000000..3c54a3834
--- /dev/null
+++ b/doc/docbkx/senlin-admin/ch_using.xml
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE chapter [
+<!-- Some useful entities borrowed from HTML -->
+<!ENTITY ndash  "&#x2013;">
+<!ENTITY mdash  "&#x2014;">
+<!ENTITY hellip "&#x2026;">
+<!ENTITY plusmn "&#xB1;">
+
+<!-- Useful for describing APIs -->
+<!ENTITY GET    '<command xmlns="http://docbook.org/ns/docbook">GET</command>'>
+<!ENTITY PUT    '<command xmlns="http://docbook.org/ns/docbook">PUT</command>'>
+<!ENTITY POST   '<command xmlns="http://docbook.org/ns/docbook">POST</command>'>
+<!ENTITY DELETE '<command xmlns="http://docbook.org/ns/docbook">DELETE</command>'>
+
+<!ENTITY CHECK  '<inlinemediaobject xmlns="http://docbook.org/ns/docbook">
+<imageobject role="fo">
+<imagedata fileref="figures/Check_mark_23x20_02.svg"
+format="SVG" scale="60"/>
+</imageobject>
+<imageobject role="html">
+<imagedata fileref="../figures/Check_mark_23x20_02.png"
+format="PNG" />
+</imageobject>
+</inlinemediaobject>'>
+
+<!ENTITY ARROW  '<inlinemediaobject xmlns="http://docbook.org/ns/docbook">
+<imageobject role="fo">
+<imagedata fileref="figures/Arrow_east.svg"
+format="SVG" scale="60"/>
+</imageobject>
+<imageobject role="html">
+<imagedata fileref="../figures/Arrow_east.png"
+format="PNG" />
+</imageobject>
+</inlinemediaobject>'>
+]>
+<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_using">
+    <title>Using Senlin</title>
+    <para>TODO</para>
+</chapter>
diff --git a/doc/docbkx/senlin-admin/pom.xml b/doc/docbkx/senlin-admin/pom.xml
new file mode 100644
index 000000000..eb5aa3695
--- /dev/null
+++ b/doc/docbkx/senlin-admin/pom.xml
@@ -0,0 +1,151 @@
+
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
+    <modelVersion>4.0.0</modelVersion>
+
+    <groupId>org.openstack.docs</groupId>
+    <artifactId>openstack-guide</artifactId>
+    <version>1.0.0-SNAPSHOT</version>
+    <packaging>jar</packaging>
+    <name>OpenStack Guides</name>
+
+    <properties>
+        <!-- This is set by Jenkins according to the branch. -->
+        <release.path.name>local</release.path.name>
+        <comments.enabled>1</comments.enabled>
+    </properties>
+    <!-- ################################################ -->
+    <!-- USE "mvn clean generate-sources" to run this POM -->
+    <!-- Builds the Senlin Administration Manual         -->
+    <!-- ################################################ -->
+    <profiles>
+        <profile>
+            <id>Rackspace Research Repositories</id>
+            <activation>
+                <activeByDefault>true</activeByDefault>
+            </activation>
+            <repositories>
+                <repository>
+                    <id>rackspace-research</id>
+                    <name>Rackspace Research Repository</name>
+                    <url>http://maven.research.rackspacecloud.com/content/groups/public/</url>
+                </repository>
+            </repositories>
+            <pluginRepositories>
+                <pluginRepository>
+                    <id>rackspace-research</id>
+                    <name>Rackspace Research Repository</name>
+                    <url>http://maven.research.rackspacecloud.com/content/groups/public/</url>
+                </pluginRepository>
+            </pluginRepositories>
+        </profile>
+    </profiles>
+
+    <build>
+        <resources>
+            <resource>
+                <directory>target/docbkx/pdf</directory>
+                <excludes>
+                    <exclude>**/*.fo</exclude>
+                </excludes>
+            </resource>
+        </resources>
+        <plugins>
+
+            <plugin>
+                <groupId>com.rackspace.cloud.api</groupId>
+                <artifactId>clouddocs-maven-plugin</artifactId>
+                <version>1.12.2</version>
+                <executions>
+                    <execution>
+                        <id>goal1</id>
+                        <goals>
+                            <goal>generate-pdf</goal>
+                        </goals>
+                        <phase>generate-sources</phase>
+                        <configuration>
+                            <highlightSource>false</highlightSource>
+                            <!-- The following elements sets the autonumbering of sections in output for chapter numbers but no numbered sections-->
+                            <sectionAutolabel>0</sectionAutolabel>
+                            <sectionLabelIncludesComponentLabel>0</sectionLabelIncludesComponentLabel>
+                        </configuration>
+                    </execution>
+                    <execution>
+                        <id>goal2</id>
+                        <goals>
+                            <goal>generate-webhelp</goal>
+                        </goals>
+                        <phase>generate-sources</phase>
+                        <configuration>
+                            <!-- These parameters only apply to webhelp -->
+                            <enableDisqus>${comments.enabled}</enableDisqus>
+                            <useVersionForDisqus>1</useVersionForDisqus>
+                            <disqusShortname>os-senlin-guides</disqusShortname>
+                            <enableGoogleAnalytics>1</enableGoogleAnalytics>
+                            <googleAnalyticsId>UA-17511903-1</googleAnalyticsId>
+                            <generateToc>
+                                appendix  toc,title
+                                article/appendix  nop
+                                article   toc,title
+                                book      title,figure,table,example,equation
+                                chapter   toc,title
+                                part      toc,title
+                                preface   toc,title
+                                qandadiv  toc
+                                qandaset  toc
+                                reference toc,title
+                                set       toc,title
+                            </generateToc>
+                            <!-- The following elements sets the autonumbering of sections in output for chapter numbers but no numbered sections-->
+                            <sectionAutolabel>0</sectionAutolabel>
+                            <sectionLabelIncludesComponentLabel>0</sectionLabelIncludesComponentLabel>
+                            <postProcess>
+                                <!-- Copies the figures to the correct location for webhelp -->
+
+                                <copy todir="${basedir}/target/docbkx/webhelp/${release.path.name}/senlin-admin/content/figures">
+                                    <fileset dir="${basedir}/figures">
+                                        <include name="**/*.*" />
+                                    </fileset>
+                                </copy>
+                                <!-- Copies webhelp (HTML output) to desired URL location on docs.openstack.org -->
+
+                                <copy
+                                    todir="${basedir}/target/docbkx/webhelp/${release.path.name}/senlin-admin">
+                                    <fileset
+                                        dir="${basedir}/target/docbkx/webhelp/bk-senlin-admin-guide/">
+                                        <include name="**/*" />
+                                    </fileset>
+                                </copy>
+
+                                <!--Moves PDFs to the needed placement -->
+
+                                <move failonerror="false"
+                                    file="${basedir}/target/docbkx/pdf/bk-senlin-admin-guide.pdf"
+                                    tofile="${basedir}/target/docbkx/webhelp/${release.path.name}/senlin-admin/bk-senlin-admin-guide-${release.path.name}.pdf"/>
+
+                                <!--Deletes leftover uneeded directories -->
+
+                                <delete dir="${basedir}/target/docbkx/webhelp/bk-senlin-admin-guide"/>
+
+                            </postProcess>
+                        </configuration>
+                    </execution>
+                </executions>
+                <configuration>
+                    <!-- These parameters apply to pdf and webhelp -->
+                    <xincludeSupported>true</xincludeSupported>
+                    <sourceDirectory>.</sourceDirectory>
+                    <includes>
+                       bk-senln-admin-guide.xml
+                    </includes>
+                    <canonicalUrlBase>http://docs.openstack.org/${release.path.name}/senlin-admin/content/</canonicalUrlBase>
+                    <profileSecurity>reviewer</profileSecurity>
+                    <branding>openstack</branding>
+                </configuration>
+            </plugin>
+
+        </plugins>
+    </build>
+</project>