diff --git a/CHANGES b/CHANGES
index a745a467c3b..a1edfdac527 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,7 +1,7 @@
 Apache CloudStack (Incubating) CHANGES
 ======================================
 
-Full release notes for each release are located in the project's documentation website:  http://incubator.apache.org/cloudstack/docs
+Full release notes for each release are located in the project's documentation website:  http://cloudstack.apache.org/docs
 
 Version 4.0.0-incubating
 ------------------------
diff --git a/INSTALL.md b/INSTALL.md
index a2137fdf69d..4f93900ddfe 100644
--- a/INSTALL.md
+++ b/INSTALL.md
@@ -1,7 +1,7 @@
 This document describes how to develop, build, package and install Apache CloudStack
 (Incubating). For more information please refer to the project's website:
 
-    http://incubator.apache.org/cloudstack
+    http://cloudstack.apache.org
 
 Apache CloudStack developers use various platforms for development, this guide
 was tested against a CentOS 6.2 x86_64 setup.
@@ -77,7 +77,7 @@ Start the MySQL service:
 
 You may get the source code from the repository hosted on Apache:
 
-    $ git clone https://git-wip-us.apache.org/repos/asf/incubator-cloudstack.git
+    $ git clone https://git-wip-us.apache.org/repos/asf/cloudstack.git
 
 Or, you may fork a repository from the official Apache CloudStack mirror by
 Apache on [Github](https://github.com/apache/incubator-cloudstack)
diff --git a/README.md b/README.md
index 7b4d973666e..7fb9b57c53f 100644
--- a/README.md
+++ b/README.md
@@ -17,12 +17,14 @@ Apache CloudStack offers three methods for managing cloud
 computing environments: an easy to use Web interface, command 
 line tools, and a full-featured RESTful API.
 
-Visit us at [cloudstack.org](http://incubator.apache.org/cloudstack).
+Visit us at [Apache CloudStack](http://cloudstack.apache.org).
 
 ## Mailing lists
-[Development Mailing List](mailto:cloudstack-dev-subscribe@incubator.apache.org)
-[Users Mailing list](mailto:cloudstack-users-subscribe@incubator.apache.org)
-[Commits mailing list](mailto:cloudstack-commits-subscribe@incubator.apache.org)
+[Development Mailing List](mailto:dev-subscribe@cloudstack.apache.org)
+[Users Mailing List](mailto:users-subscribe@cloudstack.apache.org)
+[Commits Mailing List](mailto:commits-subscribe@cloudstack.apache.org)
+[Issues Mailing List](mailto:issues-subscribe@cloudstack.apache.org)
+[Marketing Mailing List](mailto:marketing-subscribe@cloudstack.apache.org)
 
 # License
 
diff --git a/README.tools.md b/README.tools.md
index f743c8927c6..069c3426921 100644
--- a/README.tools.md
+++ b/README.tools.md
@@ -61,7 +61,7 @@ Once installed per the Vagrant installation process, run:
         $ vagrant box add devcloud [path to devcloud.box]
 
 Then, either go into the devcloudbox folder of your checked out version of the
-CloudStack code (incubator-cloudstack/tools/devcloud/devcloudbox), or copy the
+CloudStack code (cloudstack/tools/devcloud/devcloudbox), or copy the
 contents of that folder to another location.
 
 Assuming the patched Vagrant installation is working, you then