diff --git a/source/building_from_source.rst b/source/building_from_source.rst
index 56f03e4..9d67a57 100644
--- a/source/building_from_source.rst
+++ b/source/building_from_source.rst
@@ -91,7 +91,7 @@
 
 .. sourcecode:: bash
 
-   $ gpg --verify apache-cloudstack-4.3.0-src.tar.bz2.asc
+   $ gpg --verify apache-cloudstack-4.4.0-src.tar.bz2.asc
 
 If the signature is valid you will see a line of output that contains
 'Good signature'.
@@ -106,7 +106,7 @@
 
 .. sourcecode:: bash
 
-   $ gpg --print-md MD5 apache-cloudstack-4.3.0-src.tar.bz2 | diff - apache-cloudstack-4.3.0-src.tar.bz2.md5
+   $ gpg --print-md MD5 apache-cloudstack-4.4.0-src.tar.bz2 | diff - apache-cloudstack-4.4.0-src.tar.bz2.md5
 
 If this successfully completes you should see no output. If there is any
 output from them, then there is a difference between the hash you
@@ -122,7 +122,7 @@
 
 .. sourcecode:: bash
 
-   $ gpg --print-md SHA512 apache-cloudstack-4.3.0-src.tar.bz2 | diff - apache-cloudstack-4.3.0-src.tar.bz2.sha
+   $ gpg --print-md SHA512 apache-cloudstack-4.4.0-src.tar.bz2 | diff - apache-cloudstack-4.4.0-src.tar.bz2.sha
 
 If this command successfully completes you should see no output. If
 there is any output from them, then there is a difference between the
@@ -164,13 +164,13 @@
 
 .. sourcecode:: bash
 
-   $ tar -jxvf apache-cloudstack-4.3.0-src.tar.bz2
+   $ tar -jxvf apache-cloudstack-4.4.0-src.tar.bz2
 
 You can now move into the directory:
 
 .. sourcecode:: bash
 
-   $ cd ./apache-cloudstack-4.3.0-src
+   $ cd ./apache-cloudstack-4.4.0-src
 
 
 Building DEB packages
@@ -214,13 +214,13 @@
 
 .. sourcecode:: bash
 
-   cloudstack-common-4.3.0.amd64.deb
-   cloudstack-management-4.3.0.amd64.deb
-   cloudstack-agent-4.3.0.amd64.deb
-   cloudstack-usage-4.3.0.amd64.deb
-   cloudstack-awsapi-4.3.0.amd64.deb
-   cloudstack-cli-4.3.0.amd64.deb
-   cloudstack-docs-4.3.0.amd64.deb
+   cloudstack-common-4.4.0.amd64.deb
+   cloudstack-management-4.4.0.amd64.deb
+   cloudstack-agent-4.4.0.amd64.deb
+   cloudstack-usage-4.4.0.amd64.deb
+   cloudstack-awsapi-4.4.0.amd64.deb
+   cloudstack-cli-4.4.0.amd64.deb
+   cloudstack-docs-4.4.0.amd64.deb
 
 
 Setting up an APT repo
@@ -367,13 +367,13 @@
 
 .. sourcecode:: bash
 
-   cloudstack-agent-4.3.0.el6.x86_64.rpm
-   cloudstack-awsapi-4.3.0.el6.x86_64.rpm
-   cloudstack-cli-4.3.0.el6.x86_64.rpm
-   cloudstack-common-4.3.0.el6.x86_64.rpm
-   cloudstack-docs-4.3.0.el6.x86_64.rpm
-   cloudstack-management-4.3.0.el6.x86_64.rpm
-   cloudstack-usage-4.3.0.el6.x86_64.rpm
+   cloudstack-agent-4.4.0.el6.x86_64.rpm
+   cloudstack-awsapi-4.4.0.el6.x86_64.rpm
+   cloudstack-cli-4.4.0.el6.x86_64.rpm
+   cloudstack-common-4.4.0.el6.x86_64.rpm
+   cloudstack-docs-4.4.0.el6.x86_64.rpm
+   cloudstack-management-4.4.0.el6.x86_64.rpm
+   cloudstack-usage-4.4.0.el6.x86_64.rpm
 
 
 Creating a yum repo
diff --git a/source/index.rst b/source/index.rst
index 55f960f..854807f 100644
--- a/source/index.rst
+++ b/source/index.rst
@@ -24,6 +24,7 @@
 
 .. figure:: /_static/images/acslogo.png
    :align: center
+   :target: http://cloudstack.apache.org/
 
 .. warning:: 
    We are in the process of changing documentation format as well as hosting 
@@ -33,13 +34,11 @@
 This is the Apache CloudStack installation guide, for the Documentation home, 
 the administrator guide or the Release-Notes please see:
 
--  `Documentation home <http://docs.cloudstack.apache.org>`_
+-  `Documentation home`_
 
--  `Administration Guide 
-   <http://docs.cloudstack.apache.org/projects/cloudstack-administration>`_
+-  `Administration Guide`_
 
--  `Release Notes
-   <http://docs.cloudstack.apache.org/projects/cloudstack-release-notes>`_
+-  `Release Notes`_
 
 .. note::
    In this guide we first go through some design and architectural choices_ to 
@@ -141,3 +140,5 @@
    :maxdepth: 2
 
    optional_installation
+
+.. include:: _global.rst
diff --git a/source/installation.rst b/source/installation.rst
index 1ad3a26..635f0d3 100644
--- a/source/installation.rst
+++ b/source/installation.rst
@@ -177,7 +177,7 @@
 
 .. sourcecode:: bash
 
-   $ deb http://cloudstack.apt-get.eu/ubuntu precise 4.3
+   $ deb http://cloudstack.apt-get.eu/ubuntu precise 4.4
 
 We now have to add the public key to the trusted keys.
 
@@ -215,7 +215,7 @@
 
    [cloudstack]
    name=cloudstack
-   baseurl=http://cloudstack.apt-get.eu/rhel/4.3/
+   baseurl=http://cloudstack.apt-get.eu/rhel/4.4/
    enabled=1
    gpgcheck=0
 
@@ -347,7 +347,8 @@
 
       apt-get install libmysql-java
 
-   This bug has been fixed in master and upcoming 4.4 release and will also be fixed in bug fix releases 4.3.x
+   This bug has been fixed in 4.4 release and will also be fixed in bug fix releases 4.3.1
+
 
 Downloading vhd-util
 ^^^^^^^^^^^^^^^^^^^^
@@ -1146,41 +1147,60 @@
    This process will require approximately 5 GB of free space on the
    local file system and up to 30 minutes each time it runs.
 
-   -  For Hyper-V
+   *  For Hyper-V
 
-   .. sourcecode:: bash
+      .. sourcecode:: bash
 
-      # /usr/share/cloudstack-common/scripts/storage/secondary/cloud-install-sys-tmplt -m /mnt/secondary -u http://download.cloud.com/templates/4.3/systemvm64template-2014-06-23-master-hyperv.vhd.bz2 -h hyperv -s <optional-management-server-secret-key> -F
+         /usr/share/cloudstack-common/scripts/storage/secondary/cloud-install-sys-tmplt \
+         -m /mnt/secondary \
+         -u http://cloudstack.apt-get.eu/systemvm/4.4/systemvm64template-4.4.0-6-hyperv.vhd \
+         -h hyperv \
+         -s <optional-management-server-secret-key> \
+         -F
 
-   -  For XenServer:
+   *  For XenServer:
 
-   .. sourcecode:: bash
+      .. sourcecode:: bash
 
-      # /usr/share/cloudstack-common/scripts/storage/secondary/cloud-install-sys-tmplt -m /mnt/secondary -u http://download.cloud.com/templates/4.3/systemvm64template-2014-06-23-master-xen.vhd.bz2 -h xenserver -s <optional-management-server-secret-key> -F
+         /usr/share/cloudstack-common/scripts/storage/secondary/cloud-install-sys-tmplt \
+         -m /mnt/secondary \
+         -u http://cloudstack.apt-get.eu/systemvm/4.4/systemvm64template-4.4.0-6-xen.vhd.bz2 \
+         -h xenserver \
+         -s <optional-management-server-secret-key> \
+         -F
 
-   -  For vSphere:
+   *  For vSphere:
 
-   .. sourcecode:: bash
+      .. sourcecode:: bash
 
-      # /usr/share/cloudstack-common/scripts/storage/secondary/cloud-install-sys-tmplt -m /mnt/secondary -u http://download.cloud.com/templates/4.3/systemvm64template-2014-06-23-master-vmware.ova -h vmware -s <optional-management-server-secret-key>  -F
+         /usr/share/cloudstack-common/scripts/storage/secondary/cloud-install-sys-tmplt \
+         -m /mnt/secondary \
+         -u http://cloudstack.apt-get.eu/systemvm/4.4/systemvm64template-4.4.0-6-vmware.ova \
+         -h vmware \
+         -s <optional-management-server-secret-key> \
+         -F
 
-   -  For KVM:
+   *  For KVM:
 
-   .. sourcecode:: bash
+      .. sourcecode:: bash
 
-      # /usr/share/cloudstack-common/scripts/storage/secondary/cloud-install-sys-tmplt -m /mnt/secondary -u http://download.cloud.com/templates/4.3/systemvm64template-2014-06-23-master-kvm.qcow2.bz2 -h kvm -s <optional-management-server-secret-key> -F
+         /usr/share/cloudstack-common/scripts/storage/secondary/cloud-install-sys-tmplt \
+         -m /mnt/secondary \
+         -u http://cloudstack.apt-get.eu/systemvm/4.4/systemvm64template-4.4.0-6-kvm.qcow2.bz2 \
+         -h kvm \
+         -s <optional-management-server-secret-key> \
+         -F
 
-   -  For LXC:
+   *  For LXC:
 
-   .. sourcecode:: bash
+      .. sourcecode:: bash
 
-      # /usr/share/cloudstack-common/scripts/storage/secondary/cloud-install-sys-tmplt -m /mnt/secondary -u http://download.cloud.com/templates/4.3/systemvm64template-2014-06-23-master-kvm.qcow2.bz2 -h lxc -s <optional-management-server-secret-key> -F
-
-   On Ubuntu, use the following path instead:
-
-   .. sourcecode:: bash
-
-      # /usr/share/cloudstack-common/scripts/storage/secondary/cloud-install-sys-tmplt
+         /usr/share/cloudstack-common/scripts/storage/secondary/cloud-install-sys-tmplt \
+         -m /mnt/secondary \
+         -u http://cloudstack.apt-get.eu/systemvm/4.4/systemvm64template-4.4.0-6-kvm.qcow2.bz2 \
+         -h lxc \
+         -s <optional-management-server-secret-key> \
+         -F
 
 #. If you are using a separate NFS server, perform this step. If you are
    using the Management Server as the NFS server, you MUST NOT perform
diff --git a/source/qig.rst b/source/qig.rst
index cdd69c3..614815e 100644
--- a/source/qig.rst
+++ b/source/qig.rst
@@ -53,7 +53,7 @@
 
 #. At least one computer which supports hardware virtualization.
 
-#. The `CentOS 6.4 x86_64 minimal install CD 
+#. The `CentOS 6.5 x86_64 minimal install CD 
    <http://mirrors.kernel.org/centos/6/isos/x86_64/>`_
 
 #. A /24 network with the gateway being at xxx.xxx.xxx.1, no DHCP should be on 
@@ -71,7 +71,7 @@
 Operating System
 ~~~~~~~~~~~~~~~~
 
-Using the CentOS 6.4 x86_64 minimal install ISO, you'll need to install CentOS 
+Using the CentOS 6.5 x86_64 minimal install ISO, you'll need to install CentOS 
 on your hardware. The defaults will generally be acceptable for this 
 installation.
 
@@ -256,7 +256,7 @@
 
    [cloudstack]
    name=cloudstack
-   baseurl=http://cloudstack.apt-get.eu/rhel/4.3/
+   baseurl=http://cloudstack.apt-get.eu/rhel/4.4/
    enabled=1
    gpgcheck=0
 
@@ -278,8 +278,8 @@
 
 .. sourcecode:: bash
 
-   /secondary *(rw,async,no_root_squash)
-   /primary *(rw,async,no_root_squash)
+   /secondary *(rw,async,no_root_squash,no_subtree_check)
+   /primary *(rw,async,no_root_squash,no_subtree_check)
 
 You will note that we specified two directories that don't exist (yet) on the 
 system. We'll go ahead and create those directories and set permissions 
@@ -422,7 +422,11 @@
 
 .. sourcecode:: bash
   
-  # /usr/share/cloudstack-common/scripts/storage/secondary/cloud-install-sys-tmplt -m /secondary -u http://download.cloud.com/templates/4.3/systemvm64template-2014-01-14-master-kvm.qcow2.bz2 -h kvm -F
+   /usr/share/cloudstack-common/scripts/storage/secondary/cloud-install-sys-tmplt \
+   -m /secondary \
+   -u http://cloudstack.apt-get.eu/systemvm/4.4/systemvm64template-4.4.0-6-kvm.qcow2.bz2 \
+   -h kvm -F
+
 
 That concludes our setup of the management server. We still need to configure 
 CloudStack, but we will do that after we get our hypervisor set up.
@@ -652,3 +656,4 @@
 minutes depending on your internet connection speed for setup to finalize.
 
 That's it, you are done with installation of your Apache CloudStack cloud.
+