diff --git a/CONTRIBUTING b/CONTRIBUTING
index 3864b66e8..9f005cdaa 100644
--- a/CONTRIBUTING
+++ b/CONTRIBUTING
@@ -24,10 +24,10 @@ the review process.
 
     The Guacamole source is maintained in git repositories hosted on GitHub:
 
-        https://github.com/apache/incubator-guacamole-client
-        https://github.com/apache/incubator-guacamole-manual
-        https://github.com/apache/incubator-guacamole-server
-        https://github.com/apache/incubator-guacamole-website
+        https://github.com/apache/guacamole-client
+        https://github.com/apache/guacamole-manual
+        https://github.com/apache/guacamole-server
+        https://github.com/apache/guacamole-website
 
     To make your changes, fork the applicable repositories and make commits
     to a topic branch in your fork. Commits should be made in logical units
diff --git a/README b/README
index 30e913be1..a3a575222 100644
--- a/README
+++ b/README
@@ -9,11 +9,11 @@ technical users intending to compile parts of Apache Guacamole themselves.
 Source archives and pre-built .war files are available from the downloads
 section of the project website:
  
-    http://guacamole.incubator.apache.org/
+    http://guacamole.apache.org/
 
 A full manual is available as well:
 
-    http://guacamole.incubator.apache.org/doc/gug/
+    http://guacamole.apache.org/doc/gug/
 
 
 ------------------------------------------------------------
diff --git a/doc/guacamole-example/pom.xml b/doc/guacamole-example/pom.xml
index 74a73ed64..3a0438e11 100644
--- a/doc/guacamole-example/pom.xml
+++ b/doc/guacamole-example/pom.xml
@@ -28,7 +28,7 @@
     <packaging>war</packaging>
     <version>0.9.13-incubating</version>
     <name>guacamole-example</name>
-    <url>http://guacamole.incubator.apache.org/</url>
+    <url>http://guacamole.apache.org/</url>
 
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
diff --git a/doc/guacamole-playback-example/pom.xml b/doc/guacamole-playback-example/pom.xml
index 1dd8aff84..d567f7bf6 100644
--- a/doc/guacamole-playback-example/pom.xml
+++ b/doc/guacamole-playback-example/pom.xml
@@ -28,7 +28,7 @@
     <packaging>war</packaging>
     <version>0.9.13-incubating</version>
     <name>guacamole-playback-example</name>
-    <url>http://guacamole.incubator.apache.org/</url>
+    <url>http://guacamole.apache.org/</url>
 
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
diff --git a/extensions/guacamole-auth-cas/pom.xml b/extensions/guacamole-auth-cas/pom.xml
index e76c50b88..352dcb84e 100644
--- a/extensions/guacamole-auth-cas/pom.xml
+++ b/extensions/guacamole-auth-cas/pom.xml
@@ -28,7 +28,7 @@
     <packaging>jar</packaging>
     <version>0.9.13-incubating</version>
     <name>guacamole-auth-cas</name>
-    <url>http://guacamole.incubator.apache.org/</url>
+    <url>http://guacamole.apache.org/</url>
 
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
diff --git a/extensions/guacamole-auth-duo/pom.xml b/extensions/guacamole-auth-duo/pom.xml
index 104b5942b..2d49cea97 100644
--- a/extensions/guacamole-auth-duo/pom.xml
+++ b/extensions/guacamole-auth-duo/pom.xml
@@ -28,7 +28,7 @@
     <packaging>jar</packaging>
     <version>0.9.13-incubating</version>
     <name>guacamole-auth-duo</name>
-    <url>http://guacamole.incubator.apache.org/</url>
+    <url>http://guacamole.apache.org/</url>
 
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
diff --git a/extensions/guacamole-auth-header/pom.xml b/extensions/guacamole-auth-header/pom.xml
index c30aa9bbc..409a9a6d4 100644
--- a/extensions/guacamole-auth-header/pom.xml
+++ b/extensions/guacamole-auth-header/pom.xml
@@ -28,7 +28,7 @@
     <packaging>jar</packaging>
     <version>0.9.13-incubating</version>
     <name>guacamole-auth-header</name>
-    <url>http://guacamole.incubator.apache.org/</url>
+    <url>http://guacamole.apache.org/</url>
 
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
diff --git a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/pom.xml b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/pom.xml
index 4de1d69aa..0bd38218f 100644
--- a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/pom.xml
+++ b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/pom.xml
@@ -27,7 +27,7 @@
     <artifactId>guacamole-auth-jdbc-base</artifactId>
     <packaging>jar</packaging>
     <name>guacamole-auth-jdbc-base</name>
-    <url>http://guacamole.incubator.apache.org/</url>
+    <url>http://guacamole.apache.org/</url>
 
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
diff --git a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-dist/pom.xml b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-dist/pom.xml
index 05f5572d4..46c12598f 100644
--- a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-dist/pom.xml
+++ b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-dist/pom.xml
@@ -27,7 +27,7 @@
     <artifactId>guacamole-auth-jdbc-dist</artifactId>
     <packaging>jar</packaging>
     <name>guacamole-auth-jdbc-dist</name>
-    <url>http://guacamole.incubator.apache.org/</url>
+    <url>http://guacamole.apache.org/</url>
 
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
diff --git a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-mysql/pom.xml b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-mysql/pom.xml
index 232001f11..f332c2423 100644
--- a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-mysql/pom.xml
+++ b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-mysql/pom.xml
@@ -27,7 +27,7 @@
     <artifactId>guacamole-auth-jdbc-mysql</artifactId>
     <packaging>jar</packaging>
     <name>guacamole-auth-jdbc-mysql</name>
-    <url>http://guacamole.incubator.apache.org/</url>
+    <url>http://guacamole.apache.org/</url>
 
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
diff --git a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-postgresql/pom.xml b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-postgresql/pom.xml
index 7fd2eaa16..cac68f208 100644
--- a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-postgresql/pom.xml
+++ b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-postgresql/pom.xml
@@ -27,7 +27,7 @@
     <artifactId>guacamole-auth-jdbc-postgresql</artifactId>
     <packaging>jar</packaging>
     <name>guacamole-auth-jdbc-postgresql</name>
-    <url>http://guacamole.incubator.apache.org/</url>
+    <url>http://guacamole.apache.org/</url>
 
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
diff --git a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-sqlserver/pom.xml b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-sqlserver/pom.xml
index 82776f7d0..c1e7ec78c 100644
--- a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-sqlserver/pom.xml
+++ b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-sqlserver/pom.xml
@@ -27,7 +27,7 @@
     <artifactId>guacamole-auth-jdbc-sqlserver</artifactId>
     <packaging>jar</packaging>
     <name>guacamole-auth-jdbc-sqlserver</name>
-    <url>http://guacamole.incubator.apache.org/</url>
+    <url>http://guacamole.apache.org/</url>
 
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
diff --git a/extensions/guacamole-auth-jdbc/pom.xml b/extensions/guacamole-auth-jdbc/pom.xml
index 7869c8650..f9278d1da 100644
--- a/extensions/guacamole-auth-jdbc/pom.xml
+++ b/extensions/guacamole-auth-jdbc/pom.xml
@@ -28,7 +28,7 @@
     <packaging>pom</packaging>
     <version>0.9.13-incubating</version>
     <name>guacamole-auth-jdbc</name>
-    <url>http://guacamole.incubator.apache.org/</url>
+    <url>http://guacamole.apache.org/</url>
 
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
diff --git a/extensions/guacamole-auth-ldap/pom.xml b/extensions/guacamole-auth-ldap/pom.xml
index 7eef08ba9..782fd2690 100644
--- a/extensions/guacamole-auth-ldap/pom.xml
+++ b/extensions/guacamole-auth-ldap/pom.xml
@@ -28,7 +28,7 @@
     <packaging>jar</packaging>
     <version>0.9.13-incubating</version>
     <name>guacamole-auth-ldap</name>
-    <url>http://guacamole.incubator.apache.org/</url>
+    <url>http://guacamole.apache.org/</url>
 
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
diff --git a/extensions/guacamole-auth-noauth/pom.xml b/extensions/guacamole-auth-noauth/pom.xml
index 65a43be46..5060f5323 100644
--- a/extensions/guacamole-auth-noauth/pom.xml
+++ b/extensions/guacamole-auth-noauth/pom.xml
@@ -28,7 +28,7 @@
     <packaging>jar</packaging>
     <version>0.9.13-incubating</version>
     <name>guacamole-auth-noauth</name>
-    <url>http://guacamole.incubator.apache.org/</url>
+    <url>http://guacamole.apache.org/</url>
 
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
diff --git a/extensions/guacamole-auth-openid/pom.xml b/extensions/guacamole-auth-openid/pom.xml
index 4076998f1..251fbf011 100644
--- a/extensions/guacamole-auth-openid/pom.xml
+++ b/extensions/guacamole-auth-openid/pom.xml
@@ -28,7 +28,7 @@
     <packaging>jar</packaging>
     <version>0.9.13-incubating</version>
     <name>guacamole-auth-openid</name>
-    <url>http://guacamole.incubator.apache.org/</url>
+    <url>http://guacamole.apache.org/</url>
 
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
diff --git a/guacamole-common-js/pom.xml b/guacamole-common-js/pom.xml
index 10c8c4467..16dcb3f46 100644
--- a/guacamole-common-js/pom.xml
+++ b/guacamole-common-js/pom.xml
@@ -28,7 +28,7 @@
     <packaging>pom</packaging>
     <version>0.9.13-incubating</version>
     <name>guacamole-common-js</name>
-    <url>http://guacamole.incubator.apache.org/</url>
+    <url>http://guacamole.apache.org/</url>
 
     <description>
         The base JavaScript API of the Guacamole project, providing JavaScript
@@ -47,8 +47,8 @@
 
     <!-- Git repository -->
     <scm>
-        <url>https://github.com/apache/incubator-guacamole-client</url>
-        <connection>scm:git:https://git.wip-us.apache.org/repos/asf/incubator-guacamole-client.git</connection>
+        <url>https://github.com/apache/guacamole-client</url>
+        <connection>scm:git:https://git.wip-us.apache.org/repos/asf/guacamole-client.git</connection>
 
     </scm>
 
diff --git a/guacamole-common/pom.xml b/guacamole-common/pom.xml
index b41085885..1dd7bcf12 100644
--- a/guacamole-common/pom.xml
+++ b/guacamole-common/pom.xml
@@ -28,7 +28,7 @@
     <packaging>jar</packaging>
     <version>0.9.13-incubating</version>
     <name>guacamole-common</name>
-    <url>http://guacamole.incubator.apache.org/</url>
+    <url>http://guacamole.apache.org/</url>
 
     <description>
         The base Java API of the Guacamole project, providing Java support for
@@ -46,8 +46,8 @@
 
     <!-- Git repository -->
     <scm>
-        <url>https://github.com/apache/incubator-guacamole-client</url>
-        <connection>scm:git:https://git.wip-us.apache.org/repos/asf/incubator-guacamole-client.git</connection>
+        <url>https://github.com/apache/guacamole-client</url>
+        <connection>scm:git:https://git.wip-us.apache.org/repos/asf/guacamole-client.git</connection>
     </scm>
 
     <!-- Developers -->
diff --git a/guacamole-docker/README.md b/guacamole-docker/README.md
index 04066a049..21b945428 100644
--- a/guacamole-docker/README.md
+++ b/guacamole-docker/README.md
@@ -1,9 +1,9 @@
 What is Apache Guacamole?
 =========================
 
-[Apache Guacamole](http://guacamole.incubator.apache.org/) is a clientless
-remote desktop gateway. It supports standard protocols like VNC and RDP. We
-call it clientless because no plugins or client software are required.
+[Apache Guacamole](http://guacamole.apache.org/) is a clientless remote desktop
+gateway. It supports standard protocols like VNC and RDP. We call it clientless
+because no plugins or client software are required.
 
 Thanks to HTML5, once Guacamole is installed on a server, all you need to
 access your desktops is a web browser.
@@ -54,12 +54,12 @@ necessary SQL to do this is included in the Guacamole image.
 
 To generate a SQL script which can be used to initialize a fresh PostgreSQL
 database
-[as documented in the Guacamole manual](http://guacamole.incubator.apache.org/doc/gug/jdbc-auth.html#jdbc-auth-postgresql):
+[as documented in the Guacamole manual](http://guacamole.apache.org/doc/gug/jdbc-auth.html#jdbc-auth-postgresql):
 
     docker run --rm guacamole/guacamole /opt/guacamole/bin/initdb.sh --postgres > initdb.sql
 
 Alternatively, you can use the SQL scripts included with
-[guacamole-auth-jdbc](https://github.com/apache/incubator-guacamole-client/tree/0.9.10-incubating/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-postgresql/schema).
+[guacamole-auth-jdbc](https://github.com/apache/guacamole-client/tree/0.9.10-incubating/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-postgresql/schema).
 
 Once this script is generated, you must:
 
@@ -70,7 +70,7 @@ Once this script is generated, you must:
 
 The process for doing this via the `psql` and `createdb` utilities included
 with PostgreSQL is documented in
-[the Guacamole manual](http://guacamole.incubator.apache.org/doc/gug/jdbc-auth.html#jdbc-auth-postgresql).
+[the Guacamole manual](http://guacamole.apache.org/doc/gug/jdbc-auth.html#jdbc-auth-postgresql).
 
 Deploying Guacamole with MySQL authentication
 --------------------------------------------------
@@ -97,12 +97,12 @@ need to do so prior to using Guacamole. A convenience script for generating the
 necessary SQL to do this is included in the Guacamole image.
 
 To generate a SQL script which can be used to initialize a fresh MySQL database
-[as documented in the Guacamole manual](http://guacamole.incubator.apache.org/doc/gug/jdbc-auth.html#jdbc-auth-mysql):
+[as documented in the Guacamole manual](http://guacamole.apache.org/doc/gug/jdbc-auth.html#jdbc-auth-mysql):
 
     docker run --rm guacamole/guacamole /opt/guacamole/bin/initdb.sh --mysql > initdb.sql
 
 Alternatively, you can use the SQL scripts included with
-[guacamole-auth-jdbc](https://github.com/apache/incubator-guacamole-client/tree/0.9.10-incubating/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-mysql/schema).
+[guacamole-auth-jdbc](https://github.com/apache/guacamole-client/tree/0.9.10-incubating/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-mysql/schema).
 
 Once this script is generated, you must:
 
@@ -113,7 +113,7 @@ Once this script is generated, you must:
 
 The process for doing this via the `mysql` utility included with MySQL is
 documented in
-[the Guacamole manual](http://guacamole.incubator.apache.org/doc/gug/jdbc-auth.html#jdbc-auth-mysql).
+[the Guacamole manual](http://guacamole.apache.org/doc/gug/jdbc-auth.html#jdbc-auth-mysql).
 
 Reporting issues
 ================
diff --git a/guacamole-docker/bin/build-guacamole.sh b/guacamole-docker/bin/build-guacamole.sh
index 41e01b500..8a351191c 100755
--- a/guacamole-docker/bin/build-guacamole.sh
+++ b/guacamole-docker/bin/build-guacamole.sh
@@ -22,11 +22,11 @@
 ## @fn build-guacamole.sh
 ##
 ## Builds Guacamole, saving "guacamole.war" and all applicable extension .jars
-## using the incubator-guacamole-client source contained within the given
-## directory. Extension files will be grouped by their associated type, with
-## all MySQL files being placed within the "mysql/" subdirectory of the
-## destination, all PostgreSQL files being placed within the "postgresql/"
-## subdirectory of the destination, etc.
+## using the guacamole-client source contained within the given directory.
+## Extension files will be grouped by their associated type, with all MySQL
+## files being placed within the "mysql/" subdirectory of the destination, all
+## PostgreSQL files being placed within the "postgresql/" subdirectory of the
+## destination, etc.
 ##
 ## @param BUILD_DIR
 ##     The directory which currently contains the guacamole-client source and
diff --git a/guacamole-ext/pom.xml b/guacamole-ext/pom.xml
index e1c0fa98e..62f543c07 100644
--- a/guacamole-ext/pom.xml
+++ b/guacamole-ext/pom.xml
@@ -28,7 +28,7 @@
     <packaging>jar</packaging>
     <version>0.9.13-incubating</version>
     <name>guacamole-ext</name>
-    <url>http://guacamole.incubator.apache.org/</url>
+    <url>http://guacamole.apache.org/</url>
 
     <description>
         The Java API for extending the main Guacamole web application. This
@@ -46,8 +46,8 @@
 
     <!-- Git repository -->
     <scm>
-        <url>https://github.com/apache/incubator-guacamole-client</url>
-        <connection>scm:git:https://git.wip-us.apache.org/repos/asf/incubator-guacamole-client.git</connection>
+        <url>https://github.com/apache/guacamole-client</url>
+        <connection>scm:git:https://git.wip-us.apache.org/repos/asf/guacamole-client.git</connection>
     </scm>
 
     <!-- Developers -->
diff --git a/guacamole/pom.xml b/guacamole/pom.xml
index 4784cdabd..a4ca0c0ae 100644
--- a/guacamole/pom.xml
+++ b/guacamole/pom.xml
@@ -28,7 +28,7 @@
     <packaging>war</packaging>
     <version>0.9.13-incubating</version>
     <name>guacamole</name>
-    <url>http://guacamole.incubator.apache.org/</url>
+    <url>http://guacamole.apache.org/</url>
 
     <description>
         The Guacamole web application, providing authentication and an HTML5
@@ -46,8 +46,8 @@
 
     <!-- Git repository -->
     <scm>
-        <url>https://github.com/apache/incubator-guacamole-client</url>
-        <connection>scm:git:https://git.wip-us.apache.org/repos/asf/incubator-guacamole-client.git</connection>
+        <url>https://github.com/apache/guacamole-client</url>
+        <connection>scm:git:https://git.wip-us.apache.org/repos/asf/guacamole-client.git</connection>
     </scm>
 
     <!-- Developers -->
diff --git a/pom.xml b/pom.xml
index 55228f5aa..954a3180b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -28,7 +28,7 @@
     <packaging>pom</packaging>
     <version>0.9.13-incubating</version>
     <name>guacamole-client</name>
-    <url>http://guacamole.incubator.apache.org/</url>
+    <url>http://guacamole.apache.org/</url>
 
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>