diff --git a/source/_global.rst b/source/_global.rst
index 3919520..132f47f 100644
--- a/source/_global.rst
+++ b/source/_global.rst
@@ -24,7 +24,8 @@
 
 
 .. Latest version systemvm template URL
-.. |sysvm64-url-xen|    replace:: http://cloudstack.apt-get.eu/systemvm/4.5/systemvm64template-4.5-xen.vhd.bz2
-.. |sysvm64-url-kvm|    replace:: http://cloudstack.apt-get.eu/systemvm/4.5/systemvm64template-4.5-kvm.qcow2.bz2
-.. |sysvm64-url-vmware| replace:: http://cloudstack.apt-get.eu/systemvm/4.5/systemvm64template-4.5-vmware.ova
-.. |sysvm64-url-hyperv| replace:: http://cloudstack.apt-get.eu/systemvm/4.5/systemvm64template-4.5-hyperv.vhd.zip
+.. |sysvm64-url-xen|    replace:: http://cloudstack.apt-get.eu/systemvm/4.6/systemvm64template-4.6.0-xen.vhd.bz2
+.. |sysvm64-url-kvm|    replace:: http://cloudstack.apt-get.eu/systemvm/4.6/systemvm64template-4.6.0-kvm.qcow2.bz2
+.. |sysvm64-url-vmware| replace:: http://cloudstack.apt-get.eu/systemvm/4.6/systemvm64template-4.6.0-vmware.ova
+.. |sysvm64-url-hyperv| replace:: http://cloudstack.apt-get.eu/systemvm/4.6/systemvm64template-4.6.0-hyperv.vhd.zip
+.. |sysvm64-url-ovm|    replace:: http://cloudstack.apt-get.eu/systemvm/4.6/systemvm64template-4.6.0-ovm.raw.bz2
diff --git a/source/building_from_source.rst b/source/building_from_source.rst
index 759e7c6..347bc76 100644
--- a/source/building_from_source.rst
+++ b/source/building_from_source.rst
@@ -29,7 +29,7 @@
 CloudStack.
 
 The instructions here are likely version-specific. That is, the method
-for building from source for the 4.5.x series is different from the
+for building from source for the 4.6.x series is different from the
 4.2.x series.
 
 If you are working with a unreleased version of CloudStack, see the
@@ -92,7 +92,7 @@
 
 .. sourcecode:: bash
 
-   $ gpg --verify apache-cloudstack-4.5.0-src.tar.bz2.asc
+   $ gpg --verify apache-cloudstack-4.6.0-src.tar.bz2.asc
 
 If the signature is valid you will see a line of output that contains
 'Good signature'.
@@ -107,7 +107,7 @@
 
 .. sourcecode:: bash
 
-   $ gpg --print-md MD5 apache-cloudstack-4.5.0-src.tar.bz2 | diff - apache-cloudstack-4.5.0-src.tar.bz2.md5
+   $ gpg --print-md MD5 apache-cloudstack-4.6.0-src.tar.bz2 | diff - apache-cloudstack-4.6.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
@@ -123,7 +123,7 @@
 
 .. sourcecode:: bash
 
-   $ gpg --print-md SHA512 apache-cloudstack-4.5.0-src.tar.bz2 | diff - apache-cloudstack-4.5.0-src.tar.bz2.sha
+   $ gpg --print-md SHA512 apache-cloudstack-4.6.0-src.tar.bz2 | diff - apache-cloudstack-4.6.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
@@ -165,13 +165,13 @@
 
 .. sourcecode:: bash
 
-   $ tar -jxvf apache-cloudstack-4.5.0-src.tar.bz2
+   $ tar -jxvf apache-cloudstack-4.6.0-src.tar.bz2
 
 You can now move into the directory:
 
 .. sourcecode:: bash
 
-   $ cd ./apache-cloudstack-4.5.0-src
+   $ cd ./apache-cloudstack-4.6.0-src
 
 
 Building DEB packages
@@ -210,13 +210,13 @@
 
 .. sourcecode:: bash
 
-   cloudstack-common-4.5.0.amd64.deb
-   cloudstack-management-4.5.0.amd64.deb
-   cloudstack-agent-4.5.0.amd64.deb
-   cloudstack-usage-4.5.0.amd64.deb
-   cloudstack-awsapi-4.5.0.amd64.deb
-   cloudstack-cli-4.5.0.amd64.deb
-   cloudstack-docs-4.5.0.amd64.deb
+   cloudstack-common-4.6.0.amd64.deb
+   cloudstack-management-4.6.0.amd64.deb
+   cloudstack-agent-4.6.0.amd64.deb
+   cloudstack-usage-4.6.0.amd64.deb
+   cloudstack-awsapi-4.6.0.amd64.deb
+   cloudstack-cli-4.6.0.amd64.deb
+   cloudstack-docs-4.6.0.amd64.deb
 
 
 Setting up an APT repo
@@ -345,17 +345,17 @@
 ~~~~~~~~~~~~~~~
 
 Now that we have the prerequisites and source, you will cd to the 
-`packaging/centos63/` directory.
+`packaging/` directory.
 
 .. sourcecode:: bash
 
-   $ cd packaging/centos63
+   $ cd packaging/
 
 Generating RPMs is done using the ``package.sh`` script:
 
 .. sourcecode:: bash
 
-   $ ./package.sh
+   $ ./package.sh -d centos6
 
 That will run for a bit and then place the finished packages in
 ``dist/rpmbuild/RPMS/x86_64/``.
@@ -364,13 +364,13 @@
 
 .. sourcecode:: bash
 
-   cloudstack-agent-4.5.0.el6.x86_64.rpm
-   cloudstack-awsapi-4.5.0.el6.x86_64.rpm
-   cloudstack-cli-4.5.0.el6.x86_64.rpm
-   cloudstack-common-4.5.0.el6.x86_64.rpm
-   cloudstack-docs-4.5.0.el6.x86_64.rpm
-   cloudstack-management-4.5.0.el6.x86_64.rpm
-   cloudstack-usage-4.5.0.el6.x86_64.rpm
+   cloudstack-agent-4.6.0.el6.x86_64.rpm
+   cloudstack-awsapi-4.6.0.el6.x86_64.rpm
+   cloudstack-cli-4.6.0.el6.x86_64.rpm
+   cloudstack-common-4.6.0.el6.x86_64.rpm
+   cloudstack-docs-4.6.0.el6.x86_64.rpm
+   cloudstack-management-4.6.0.el6.x86_64.rpm
+   cloudstack-usage-4.6.0.el6.x86_64.rpm
 
 
 Creating a yum repo
diff --git a/source/conf.py b/source/conf.py
index 8352665..44450c3 100644
--- a/source/conf.py
+++ b/source/conf.py
@@ -61,9 +61,9 @@
 # built documents.
 #
 # The short X.Y version.
-version = '4.5'
+version = '4.6'
 # The full version, including alpha/beta/rc tags.
-release = '4.5.0'
+release = '4.6.0'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.
diff --git a/source/installation.rst.old b/source/installation.rst.old
index 9245c97..88bf1ee 100644
--- a/source/installation.rst.old
+++ b/source/installation.rst.old
@@ -86,7 +86,7 @@
 
 -  Operating system:
 
-   -  Preferred: CentOS/RHEL 6.3+ or Ubuntu 12.04(.1)
+   -  Preferred: CentOS/RHEL 6.3+ or Ubuntu 14.04(.2)
 
 -  64-bit x86 CPU (more cores results in better performance)
 
@@ -173,7 +173,7 @@
 
 .. sourcecode:: bash
 
-   $ deb http://cloudstack.apt-get.eu/ubuntu precise 4.4
+   $ deb http://cloudstack.apt-get.eu/ubuntu precise 4.6
 
 We now have to add the public key to the trusted keys.
 
@@ -211,7 +211,7 @@
 
    [cloudstack]
    name=cloudstack
-   baseurl=http://cloudstack.apt-get.eu/rhel/4.4/
+   baseurl=http://cloudstack.apt-get.eu/rhel/4.6/
    enabled=1
    gpgcheck=0
 
@@ -343,7 +343,7 @@
 
       apt-get install libmysql-java
 
-   This bug has been fixed in 4.4 release and will also be fixed in bug fix releases 4.3.1
+   This bug has been fixed in 4.4 release.
 
 
 Downloading vhd-util
@@ -1149,7 +1149,7 @@
 
          /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.1-7-hyperv.vhd \
+         -u http://cloudstack.apt-get.eu/systemvm/4.6/systemvm64template-4.6.0-hyperv.vhd.zip \
          -h hyperv \
          -s <optional-management-server-secret-key> \
          -F
@@ -1160,7 +1160,7 @@
 
          /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.1-7-xen.vhd.bz2 \
+         -u http://cloudstack.apt-get.eu/systemvm/4.6/systemvm64template-4.6.0-xen.vhd.bz2 \
          -h xenserver \
          -s <optional-management-server-secret-key> \
          -F
@@ -1171,7 +1171,7 @@
 
          /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.1-7-vmware.ova \
+         -u http://cloudstack.apt-get.eu/systemvm/4.6/systemvm64template-4.6.0-vmware.ova \
          -h vmware \
          -s <optional-management-server-secret-key> \
          -F
@@ -1182,7 +1182,7 @@
 
          /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.1-7-kvm.qcow2.bz2 \
+         -u http://cloudstack.apt-get.eu/systemvm/4.6/systemvm64template-4.6.0-kvm.qcow2.bz2 \
          -h kvm \
          -s <optional-management-server-secret-key> \
          -F
@@ -1193,11 +1193,22 @@
 
          /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.1-7-kvm.qcow2.bz2 \
+         -u http://cloudstack.apt-get.eu/systemvm/4.6/systemvm64template-4.6.0-kvm.qcow2.bz2 \
          -h lxc \
          -s <optional-management-server-secret-key> \
          -F
 
+   *  For OVM3:
+
+      .. sourcecode:: bash
+
+         /usr/share/cloudstack-common/scripts/storage/secondary/cloud-install-sys-tmplt \
+         -m /mnt/secondary \
+         -u http://cloudstack.apt-get.eu/systemvm/4.6/systemvm64template-4.6.0-ovm.raw.bz2 \
+         -h ovm3 \
+         -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
    this step.
diff --git a/source/management-server/_pkg_repo.rst b/source/management-server/_pkg_repo.rst
index 3ecb2bf..ac3cfd5 100644
--- a/source/management-server/_pkg_repo.rst
+++ b/source/management-server/_pkg_repo.rst
@@ -53,7 +53,7 @@
 
    [cloudstack]
    name=cloudstack
-   baseurl=http://cloudstack.apt-get.eu/centos/6/4.5/
+   baseurl=http://cloudstack.apt-get.eu/centos/6/4.6/
    enabled=1
    gpgcheck=0
 
@@ -73,7 +73,7 @@
 
 .. sourcecode:: bash
 
-   deb http://cloudstack.apt-get.eu/ubuntu precise 4.5
+   deb http://cloudstack.apt-get.eu/ubuntu precise 4.6
 
 We now have to add the public key to the trusted keys.
 
diff --git a/source/management-server/_systemvm.rst b/source/management-server/_systemvm.rst
index eb3dddb..9e705dc 100644
--- a/source/management-server/_systemvm.rst
+++ b/source/management-server/_systemvm.rst
@@ -45,7 +45,7 @@
 
          /usr/share/cloudstack-common/scripts/storage/secondary/cloud-install-sys-tmplt \
          -m /mnt/secondary \
-         -u http://cloudstack.apt-get.eu/systemvm/4.5/systemvm64template-4.5-hyperv.vhd.zip \
+         -u http://cloudstack.apt-get.eu/systemvm/4.6/systemvm64template-4.6.0-hyperv.vhd.zip \
          -h hyperv \
          -s <optional-management-server-secret-key> \
          -F
@@ -56,7 +56,7 @@
 
          /usr/share/cloudstack-common/scripts/storage/secondary/cloud-install-sys-tmplt \
          -m /mnt/secondary \
-         -u http://cloudstack.apt-get.eu/systemvm/4.5/systemvm64template-4.5-xen.vhd.bz2 \
+         -u http://cloudstack.apt-get.eu/systemvm/4.6/systemvm64template-4.6.0-xen.vhd.bz2 \
          -h xenserver \
          -s <optional-management-server-secret-key> \
          -F
@@ -67,7 +67,7 @@
 
          /usr/share/cloudstack-common/scripts/storage/secondary/cloud-install-sys-tmplt \
          -m /mnt/secondary \
-         -u http://cloudstack.apt-get.eu/systemvm/4.5/systemvm64template-4.5-vmware.ova \
+         -u http://cloudstack.apt-get.eu/systemvm/4.6/systemvm64template-4.6.0-vmware.ova \
          -h vmware \
          -s <optional-management-server-secret-key> \
          -F
@@ -78,7 +78,7 @@
 
          /usr/share/cloudstack-common/scripts/storage/secondary/cloud-install-sys-tmplt \
          -m /mnt/secondary \
-         -u http://cloudstack.apt-get.eu/systemvm/4.5/systemvm64template-4.5-kvm.qcow2.bz2 \
+         -u http://cloudstack.apt-get.eu/systemvm/4.6/systemvm64template-4.6.0-kvm.qcow2.bz2 \
          -h kvm \
          -s <optional-management-server-secret-key> \
          -F
@@ -89,11 +89,22 @@
 
          /usr/share/cloudstack-common/scripts/storage/secondary/cloud-install-sys-tmplt \
          -m /mnt/secondary \
-         -u http://cloudstack.apt-get.eu/systemvm/4.5/systemvm64template-4.5-kvm.qcow2.bz2 \
+         -u http://cloudstack.apt-get.eu/systemvm/4.6/systemvm64template-4.6.0-kvm.qcow2.bz2 \
          -h lxc \
          -s <optional-management-server-secret-key> \
          -F
 
+   *  For OVM3:
+
+      .. sourcecode:: bash
+
+         /usr/share/cloudstack-common/scripts/storage/secondary/cloud-install-sys-tmplt \
+         -m /mnt/secondary \
+         -u http://cloudstack.apt-get.eu/systemvm/4.6/systemvm64template-4.6.0-ovm.raw.bz2 \
+         -h ovm3 \
+         -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
    this step.
diff --git a/source/qig.rst b/source/qig.rst
index f955b59..80af0a3 100644
--- a/source/qig.rst
+++ b/source/qig.rst
@@ -256,7 +256,7 @@
 
    [cloudstack]
    name=cloudstack
-   baseurl=http://cloudstack.apt-get.eu/centos/6/4.5/
+   baseurl=http://cloudstack.apt-get.eu/centos/6/4.6/
    enabled=1
    gpgcheck=0
 
@@ -426,7 +426,7 @@
   
    /usr/share/cloudstack-common/scripts/storage/secondary/cloud-install-sys-tmplt \
    -m /secondary \
-   -u http://cloudstack.apt-get.eu/systemvm/4.5/systemvm64template-4.5-kvm.qcow2.bz2 \
+   -u http://cloudstack.apt-get.eu/systemvm/4.6/systemvm64template-4.6.0-kvm.qcow2.bz2 \
    -h kvm -F