diff --git a/docs/en-US/build-nonoss.xml b/docs/en-US/build-nonoss.xml
index fceca6071c2..dbcab99e9bb 100644
--- a/docs/en-US/build-nonoss.xml
+++ b/docs/en-US/build-nonoss.xml
@@ -31,9 +31,9 @@ under the License.
     <orderedlist>
         <listitem>
             <para>To build the Non-OSS plugins, you'll need to have the requisite JARs installed under the <filename>deps</filename> directory.</para>
-            <para>Because these modules require dependencies that can't be distributed with &PRODUCT; you'll need to download them yourself. Links to the most recent dependencies are listed on the <ulink url="https://cwiki.apache.org/CLOUDSTACK/how-to-build-on-master-branch.html"><emphasis>How to build on master branch</emphasis></ulink> page on the wiki.</para></listitem>
+            <para>Because these modules require dependencies that can't be distributed with &PRODUCT; you'll need to download them yourself. Links to the most recent dependencies are listed on the <ulink url="https://cwiki.apache.org/confluence/display/CLOUDSTACK/How+to+build+CloudStack"><emphasis>How to build CloudStack</emphasis></ulink> page on the wiki.</para></listitem>
         <listitem>
-            <para>You may also need to download <ulink url="http://download.cloud.com.s3.amazonaws.com/tools/vhd-util">vhd-util</ulink>, which was removed due to licensing issues. You'll copy vhd-util to the <filename>scripts/vm/hypervisor/xenserver/</filename> directory.</para>
+            <para>You may also need to download <ulink url="http://download.cloud.com.s3.amazonaws.com/tools/vhd-util">vhd-util</ulink> when using XenServer hypervisors, which was removed due to licensing issues. You'll copy vhd-util to the <filename>scripts/vm/hypervisor/xenserver/</filename> directory.</para>
         </listitem>
         <listitem>
             <para>Once you have all the dependencies copied over, you'll be able to build &PRODUCT; with the <command>nonoss</command> option:</para>
diff --git a/docs/en-US/build-rpm.xml b/docs/en-US/build-rpm.xml
index 100a06f486e..c15074293a6 100644
--- a/docs/en-US/build-rpm.xml
+++ b/docs/en-US/build-rpm.xml
@@ -53,7 +53,16 @@ under the License.
             <programlisting><prompt>$</prompt>./package.sh</programlisting>
         </para>
         <para>That will run for a bit and then place the finished packages in <filename>dist/rpmbuild/RPMS/x86_64/</filename>.</para>
-        <para>You should see seven RPMs in that directory: <filename>cloudstack-agent-4.1.0-SNAPSHOT.el6.x86_64.rpm</filename>, <filename>cloudstack-awsapi-4.1.0-SNAPSHOT.el6.x86_64.rpm</filename>, <filename>cloudstack-cli-4.1.0-SNAPSHOT.el6.x86_64.rpm</filename>, <filename>cloudstack-common-4.1.0-SNAPSHOT.el6.x86_64.rpm</filename>, <filename>cloudstack-docs-4.1.0-SNAPSHOT.el6.x86_64.rpm</filename>, <filename>cloudstack-management-4.1.0-SNAPSHOT.el6.x86_64.rpm</filename>, and <filename>cloudstack-usage-4.1.0-SNAPSHOT.el6.x86_64.rpm</filename>.</para>
+        <para>You should see seven RPMs in that directory: </para>
+            <programlisting>
+                cloudstack-agent-4.1.0-SNAPSHOT.el6.x86_64.rpm
+                cloudstack-awsapi-4.1.0-SNAPSHOT.el6.x86_64.rpm
+                cloudstack-cli-4.1.0-SNAPSHOT.el6.x86_64.rpm
+                cloudstack-common-4.1.0-SNAPSHOT.el6.x86_64.rpm
+                cloudstack-docs-4.1.0-SNAPSHOT.el6.x86_64.rpm
+                cloudstack-management-4.1.0-SNAPSHOT.el6.x86_64.rpm
+                cloudstack-usage-4.1.0-SNAPSHOT.el6.x86_64.rpm
+            </programlisting>
             <section id="sect-source-buildrpm-repo">
                 <title>Creating a yum repo</title>
                 <para>