diff --git a/doc/pom.xml b/doc/pom.xml
index 07abedb323..7d1accc1a5 100644
--- a/doc/pom.xml
+++ b/doc/pom.xml
@@ -154,6 +154,62 @@
                                 <delete dir="${basedir}/target/docbkx/webhelp/openstack-object-storage-admin"/>
                                 <delete dir="${basedir}/target/docbkx/webhelp/openstack-image-service-admin"/>
                                 
+                            </postProcess>
+                        </configuration>
+                    </execution>
+                    <execution>
+                        <id>goal3</id>
+                        <goals>
+                            <goal>generate-epub</goal>
+                        </goals>
+                        <phase>generate-sources</phase>
+                        <configuration>
+                            <highlightSource>true</highlightSource>
+                            <!-- 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 epub -->
+                                <mkdir dir="${basedir}/target/docbkx/epub/openstack-compute-admin/os-compute-adminguide/figures"/>
+                                <copy todir="${basedir}/target/docbkx/epub/openstack-compute-admin/os-compute-adminguide/figures">
+                                    <fileset dir="${basedir}/src/docbkx/openstack-compute-admin/figures">
+                                        <include name="**/*.png" />
+                                        <include name="**/*.jpg" />
+                                        <include name="**/*.gif" />
+                                    </fileset>
+                                </copy>
+                                <copy todir="${basedir}/target/docbkx/epub/openstack-image-service-admin/os-image-adminguide/figures">
+                                    <fileset dir="${basedir}/src/docbkx/openstack-image-service-admin/figures">
+                                        <include name="**/*.png" />
+                                    </fileset>
+                                </copy>
+                                <copy todir="${basedir}/target/docbkx/epub/openstack-object-storage-admin/os-objectstorage-adminguide/figures">
+                                    <fileset dir="${basedir}/src/docbkx/openstack-object-storage-admin/figures">
+                                        <include name="**/*.png" />
+                                    </fileset>
+                                </copy>
+                                
+                                <!-- Rezip now that the figures are in the correct location -->
+                                <zip
+                                    destfile="${basedir}/target/docbkx/webhelp/openstack-compute-admin/os-compute-adminguide/os-compute-adminguide.epub"
+                                    basedir="${basedir}/target/docbkx/epub/openstack-compute-admin/os-compute-adminguide/"
+                                    update="true"
+                                    excludes="**/*.epub"/>
+                                
+                                <zip
+                                    destfile="${basedir}/target/docbkx/webhelp/openstack-image-service-admin/os-image-adminguide/os-image-adminguide.epub"
+                                    basedir="${basedir}/target/docbkx/epub/openstack-image-service-admin/os-image-adminguide/"
+                                    update="true"
+                                    excludes="**/*.epub"/>
+                                    
+                                <zip
+                                    destfile="${basedir}/target/docbkx/webhelp/openstack-object-service-admin/os-objectstorage-adminguide/os-objectstorage-adminguide.epub"
+                                    basedir="${basedir}/target/docbkx/epub/openstack-object-service-admin/os-objectstorage-adminguide/"
+                                    update="true"
+                                    excludes="**/*.epub"/>
+                                
+                                
                             </postProcess>
                         </configuration>
                     </execution>
diff --git a/doc/src/docbkx/common/getstart.xml b/doc/src/docbkx/common/getstart.xml
index 1e3208a5e8..3b52b3af45 100644
--- a/doc/src/docbkx/common/getstart.xml
+++ b/doc/src/docbkx/common/getstart.xml
@@ -68,7 +68,7 @@
                     demand. This is similar to Rackspace Cloud Servers or Amazon EC2.</para></listitem></itemizedlist><para>While these three projects provide the core of the cloud infrastructure, OpenStack is open and
             evolving — <link xlink:href="http://wiki.openstack.org/Projects">there will be more
                 projects</link> (there are already related projects for <link
-                xlink:href="https://launchpad.net/openstack-dashboard">web interfaces</link> and a
+                xlink:href="https://launchpad.net/horizon">web interfaces</link> and a
                 <link xlink:href="http://wiki.openstack.org/QueueService">queue service</link>).
             With that brief introduction, let’s delve into a conceptual architecture and then
             examine how OpenStack Compute could map to it. </para>