diff --git a/docs/en-US/build-rpm.xml b/docs/en-US/build-rpm.xml
index 574065833ff..7caf924bfe4 100644
--- a/docs/en-US/build-rpm.xml
+++ b/docs/en-US/build-rpm.xml
@@ -41,9 +41,9 @@ under the License.
     <para>You probably want to ensure that your environment variables will survive a logout/reboot. 
         Be sure to update <filename>~/.bashrc</filename> with the PATH and JAVA_HOME variables.</para>
 
-    <para>Building RPMs for $PRODUCT; is fairly simple. Assuming you already have the source downloaded and have uncompressed the tarball into a local directory, you're going to be able to generate packages in just a few minutes.</para>
+    <para>Building RPMs for &PRODUCT; is fairly simple. Assuming you already have the source downloaded and have uncompressed the tarball into a local directory, you're going to be able to generate packages in just a few minutes.</para>
     <note><title>Packaging has Changed</title>
-        <para>If you've created packages for $PRODUCT; previously, you should be aware that the process has changed considerably since the project has moved to using Apache Maven. Please be sure to follow the steps in this section closely.</para>
+        <para>If you've created packages for &PRODUCT; previously, you should be aware that the process has changed considerably since the project has moved to using Apache Maven. Please be sure to follow the steps in this section closely.</para>
     </note>
     <section id="generating-rpms">
         <title>Generating RPMS</title>
@@ -69,7 +69,7 @@ under the License.
                 <title>Configuring your systems to use your new yum repository</title>
                 <para>
                     Now that your yum repository is populated with RPMs and metadata
-                    we need to configure the machines that need to install $PRODUCT;.
+                    we need to configure the machines that need to install &PRODUCT;.
                     Create a file named <filename>/etc/yum.repos.d/cloudstack.repo</filename> with this information:
                     <programlisting>
                         [apache-cloudstack]
@@ -79,7 +79,7 @@ under the License.
                         gpgcheck=0
                     </programlisting>
                 </para>
-                <para> Completing this step will allow you to easily install $PRODUCT; on a number of machines across the network. 
+                <para> Completing this step will allow you to easily install &PRODUCT; on a number of machines across the network. 
                 </para>
             </section>
         </section>
diff --git a/docs/en-US/deployment-architecture-overview.xml b/docs/en-US/deployment-architecture-overview.xml
index e3103c52c1c..835898ced7f 100644
--- a/docs/en-US/deployment-architecture-overview.xml
+++ b/docs/en-US/deployment-architecture-overview.xml
@@ -49,7 +49,7 @@
        multi-node Management Server installation and up to tens of thousands of
        hosts using any of several advanced networking setups. For 
        information about deployment options, see the "Choosing a Deployment Architecture" 
-       section of the $PRODUCT; Installation Guide.
+       section of the &PRODUCT; Installation Guide.
 	</para>
 	<xi:include href="management-server-overview.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
 	<xi:include href="cloud-infrastructure-overview.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />