diff --git a/docs/publican-cloudstack/defaults.cfg b/docs/publican-cloudstack/defaults.cfg
index 6aebaee5a83..9e27bdd309d 100644
--- a/docs/publican-cloudstack/defaults.cfg
+++ b/docs/publican-cloudstack/defaults.cfg
@@ -16,6 +16,6 @@
# specific language governing permissions and limitations
# under the License.
-doc_url: "http://docs.cloudstack.org"
+doc_url: "http://incubator.apache.org/cloudstack/docs"
prod_url: "http://cloudstack.org"
diff --git a/docs/publican-cloudstack/en-US/Legal_Notice.xml b/docs/publican-cloudstack/en-US/Legal_Notice.xml
index 0e4be5bf56a..5e30efb07c0 100644
--- a/docs/publican-cloudstack/en-US/Legal_Notice.xml
+++ b/docs/publican-cloudstack/en-US/Legal_Notice.xml
@@ -53,6 +53,15 @@
completeness or stability of the code, it does indicate that the project
has yet to be fully endorsed by the ASF.
+
+
+ CloudStack® is a registered trademark of the Apache Software Foundation.
+
+
+
+ Apache CloudStack, the CloudStack word design, the Apache CloudStack word design, and the cloud monkey logo are trademarks of the
+ Apache Software Foundation.
+
diff --git a/docs/publican-cloudstack/publican-cloudstack.spec b/docs/publican-cloudstack/publican-cloudstack.spec
index 1e70765facd..9ec15d0254f 100644
--- a/docs/publican-cloudstack/publican-cloudstack.spec
+++ b/docs/publican-cloudstack/publican-cloudstack.spec
@@ -18,7 +18,7 @@
Name: publican-cloudstack
Summary: Common documentation files for Apache %{brand}
-Version: 0.4
+Version: 0.5
Release: 1%{?dist}
License: ASLv2
Group: Applications/Text
@@ -49,12 +49,14 @@ rm -rf $RPM_BUILD_ROOT
%files
%defattr(-,root,root,-)
-%doc README
%doc LICENSE
%doc NOTICE
%{_datadir}/publican/Common_Content/%{brand}
%changelog
+* Tue Feb 29 2013 David Nalley 0.5-1
+- adding trademark information
+
* Sun Sep 22 2012 David Nalley 0.4-1
- added 'Apache' to the description
- moved the issue tracker url to the ASF jira instance
diff --git a/tools/apidoc/generateadmincommands.xsl b/tools/apidoc/generateadmincommands.xsl
index 3e9c6c598fa..a33e7baf20d 100644
--- a/tools/apidoc/generateadmincommands.xsl
+++ b/tools/apidoc/generateadmincommands.xsl
@@ -138,8 +138,16 @@ version="1.0">
+