diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index b09c1075597..bb6f5e9711b 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -1,5 +1,5 @@
 # Contributing
 
-Pants Developer Center: http://pantsbuild.github.io/dev.html (hacking on Pants itself)
+Pants Developer Center: http://pantsbuild.org/dev.html (hacking on Pants itself)
 
-Pants Contributors Guide: http://pantsbuild.github.io/howto_contribute.html (interact with pantsbuild community)
+Pants Contributors Guide: http://pantsbuild.org/howto_contribute.html (interact with pantsbuild community)
diff --git a/README.md b/README.md
index b0b154c2c22..87e7776e9c5 100644
--- a/README.md
+++ b/README.md
@@ -4,7 +4,7 @@ Pants is a build system for software projects in a variety of languages.
 It works particularly well for a source code repository that contains
 many distinct projects.
 
-Friendly documentation: http://pantsbuild.github.io/
+Friendly documentation: http://pantsbuild.org/
 
 We release to [PyPI](https://pypi.python.org/pypi)
 [![version](https://img.shields.io/pypi/v/pantsbuild.pants.svg)](https://pypi.python.org/pypi/pantsbuild.pants)
diff --git a/contrib/README.md b/contrib/README.md
index ef6314d942d..c561f8e0983 100644
--- a/contrib/README.md
+++ b/contrib/README.md
@@ -99,7 +99,7 @@ Contrib plugins should generally follow 3 basic setup steps:
    )
    ```
    NB: The act of releasing your contrib distribution is part of of the normal `pantsbuild.pants`
-   [release process](https://pantsbuild.github.io/howto_contribute.html).  You may need to request
+   [release process](https://pantsbuild.org/howto_contribute.html).  You may need to request
    a release from the owners if you have a change that should be fast-tracked before the next
    `pantsbuild.pants` release.  You can always test that your contrib distribution works though by
    doing a release dry run:
diff --git a/examples/src/java/org/pantsbuild/example/hello/main/README.md b/examples/src/java/org/pantsbuild/example/hello/main/README.md
index d16c25fcff8..98ab673ad86 100644
--- a/examples/src/java/org/pantsbuild/example/hello/main/README.md
+++ b/examples/src/java/org/pantsbuild/example/hello/main/README.md
@@ -6,9 +6,9 @@ It doesn't do much, but shows how BUILD files and .java code interrelate.
 
 It's the example code for some pants documentation:
 
-* [Pants: First Tutorial](http://pantsbuild.github.io/first_tutorial.html)
-* [JVM Projects with Pants](http://pantsbuild.github.io/JVMProjects.html)
-* [Pants: JVM 3rdparty Pattern](http://pantsbuild.github.io/3rdparty_jvm.html)
+* [Pants: First Tutorial](http://pantsbuild.org/first_tutorial.html)
+* [JVM Projects with Pants](http://pantsbuild.org/JVMProjects.html)
+* [Pants: JVM 3rdparty Pattern](http://pantsbuild.org/3rdparty_jvm.html)
 
 The Java code that does something, such as it is:
 
diff --git a/src/docs/1.0.md b/src/docs/1.0.md
index 506040f20b4..f8560565884 100644
--- a/src/docs/1.0.md
+++ b/src/docs/1.0.md
@@ -6,7 +6,7 @@ Pants 1.0 Release
 The Pants project is proud to announce the 1.0 release of the Pants Build System.   Pants is a build system
 for software projects in a variety of languages.  Although in use for years in production environments at
 Twitter, Foursquare, and Square, we have now packaged the tool in such a way to make it easier to install,
-configure and customize.  You can try installing it today with a single [command](http://pantsbuild.github.io/install.html#recommended-installation).
+configure and customize.  You can try installing it today with a single [command](http://pantsbuild.org/install.html#recommended-installation).
 
 Pants is designed to work well with a large repository consisting of many smaller projects that share many
 library dependencies (also known as a monorepo).
@@ -36,10 +36,10 @@ Major features of Pants include:
   - Integration with external python and JVM artifact repositories using PEX and Ivy
   - Bootstraps from a single install script
 
-Although Pants has a long track record in the build environment of some companies, the 1.0 release represents a milestone where we believe the tool is ready for general use. Pants releases are now distributed through [PYPI](https://pypi.python.org/pypi/pantsbuild.pants), the public Python module repository.  [Installation](https://pantsbuild.github.io/install.html) is simple and bootstraps all the tools you need.  A powerful, modular [options](http://pantsbuild.github.io/options_reference.html) system allows you to control many aspects of Pants' execution.  Integration with Python and JVM repositories is robust and mature.
+Although Pants has a long track record in the build environment of some companies, the 1.0 release represents a milestone where we believe the tool is ready for general use. Pants releases are now distributed through [PYPI](https://pypi.python.org/pypi/pantsbuild.pants), the public Python module repository.  [Installation](http://pantsbuild.org/install.html) is simple and bootstraps all the tools you need.  A powerful, modular [options](http://pantsbuild.org/options_reference.html) system allows you to control many aspects of Pants' execution.  Integration with Python and JVM repositories is robust and mature.
 
-Although Pants ships with enough functionality out of the box to power builds for a large enterprise, you may want to [develop](http://pantsbuild.github.io/dev.html) your own features.  The Pants 1.0 release branch will maintain a stable set of interfaces for module developers and command line use.  Like Pants itself, pluggable third party modules can be shared through PYPI.  Non breaking improvements will be accepted into the 1.0 release branch. Additional features are already in the works and planned for future releases.
+Although Pants ships with enough functionality out of the box to power builds for a large enterprise, you may want to [develop](http://pantsbuild.org/dev.html) your own features.  The Pants 1.0 release branch will maintain a stable set of interfaces for module developers and command line use.  Like Pants itself, pluggable third party modules can be shared through PYPI.  Non breaking improvements will be accepted into the 1.0 release branch. Additional features are already in the works and planned for future releases.
 
 ## About the Pants OSS Project
 
-The Pants open source project is inspired by the Google internal build system known as Blaze, now available as the [Bazel](http://bazel.io) open source project.  It is used today to support monorepo style development in many [organizations](https://pantsbuild.github.io/powered_by.html).  The tool was born as an internal project at Twitter in 2010, and was distributed alongside the [twitter-commons](https://github.com/twitter/commons) library.  In 2012, Foursquare picked up the tool and helped lead Pants development.  In 2014, Pants became a standalone open source project on [github](http://github.com/pantsbuild/pants) with intense collaboration from developers at Twitter, Foursquare, and Square and other companies.  Today Pants is supported by a thriving open source community with contributions from over 100 authors.  To learn how you can join this community, see the [Pants build website](https://pantsbuild.github.io/howto_contribute.html).
+The Pants open source project is inspired by the Google internal build system known as Blaze, now available as the [Bazel](http://bazel.io) open source project.  It is used today to support monorepo style development in many [organizations](http://pantsbuild.org/powered_by.html).  The tool was born as an internal project at Twitter in 2010, and was distributed alongside the [twitter-commons](https://github.com/twitter/commons) library.  In 2012, Foursquare picked up the tool and helped lead Pants development.  In 2014, Pants became a standalone open source project on [github](http://github.com/pantsbuild/pants) with intense collaboration from developers at Twitter, Foursquare, and Square and other companies.  Today Pants is supported by a thriving open source community with contributions from over 100 authors.  To learn how you can join this community, see the [Pants build website](http://pantsbuild.org/howto_contribute.html).
diff --git a/src/docs/announce_201409.md b/src/docs/announce_201409.md
index 59981e57c43..0107b4b88fa 100644
--- a/src/docs/announce_201409.md
+++ b/src/docs/announce_201409.md
@@ -15,7 +15,7 @@ Another solution is to have a single large, unified code base. We’ve
 found that this promotes better engineering team cohesion and
 collaboration which results in greater productivity and happiness.
 However, tooling for such structured code bases has been lacking which
-is why we developed [Pants](http://pantsbuild.github.io/), an open
+is why we developed [Pants](http://pantsbuild.org/), an open
 source build system written in Python.
 
 Pants models code modules (known as “targets”) and their dependencies in
@@ -50,11 +50,11 @@ now lives in a standalone repo at <https://github.com/pantsbuild/pants>.
 
 Among Pants’s current strengths are:
 
--   Builds [Java](http://pantsbuild.github.io/JVMProjects.html), Scala,
-    and [Python](http://pantsbuild.github.io/python-readme.html).
+-   Builds [Java](http://pantsbuild.org/JVMProjects.html), Scala,
+    and [Python](http://pantsbuild.org/python-readme.html).
 -   Adding support for new languages is straightforward.
 -   Supports code generation:
-    [thrift](http://pantsbuild.github.io/ThriftDeps.html), protocol
+    [thrift](http://pantsbuild.org/ThriftDeps.html), protocol
     buffers, custom code generators.
 -   Resolves external JVM and Python dependencies.
 -   Runs tests.
@@ -83,7 +83,7 @@ Pants is still a young and evolving open source project. We constantly
 strive to make it easier to use. If you’re interested in using or
 learning from Pants, our advice is to reach out to the community on the
 [developer mailing
-list](http://pantsbuild.github.io/howto_contribute.html) and follow
+list](http://pantsbuild.org/howto_contribute.html) and follow
 [@pantsbuild](https://twitter.com/pantsbuild) on Twitter for updates.
 
 **Organization Perspectives:**
diff --git a/src/docs/docs.md b/src/docs/docs.md
index f7dc7ad38e0..f305dec745c 100644
--- a/src/docs/docs.md
+++ b/src/docs/docs.md
@@ -40,7 +40,7 @@ is derived from the docstrings of the classes implementing those symbols.
 Generating the site
 -------------------
 
-To see http://pantsbuild.github.io/ site's content as it would be generated based on your local
+To see http://pantsbuild.org/ site's content as it would be generated based on your local
 copy of the pants repo, enter the command
 
     :::bash
@@ -59,16 +59,16 @@ worry—you'll get a chance to abort the publish just before it's committed remo
     :::bash
     # This publishes the docs locally and opens (-o) them in your browser for review
     # and then prompts you to confirm you want to publish these docs remotely before
-    # proceeding to publish to http://pantsbuild.github.io
+    # proceeding to publish to http://pantsbuild.org
     ./build-support/bin/publish_docs.sh -op
 
 If you'd like to publish remotely for others to preview your changes easily, the `-d` option creates
-a copy of the site in a subdir of <http://pantsbuild.github.io/>:
+a copy of the site in a subdir of <http://pantsbuild.org/>:
 
     :::bash
     # This publishes the docs locally and opens (-o) them in your browser for review
     # and then prompts you to confirm you want to publish these docs remotely before
-    # proceeding to publish to http://pantsbuild.github.io/sirois-test-site
+    # proceeding to publish to http://pantsbuild.org/sirois-test-site
     ./build-support/bin/publish_docs.sh -opd sirois-test-site
 
 Cross References
diff --git a/src/docs/docsite.html.mustache b/src/docs/docsite.html.mustache
index e65431a4281..456d0194efd 100644
--- a/src/docs/docsite.html.mustache
+++ b/src/docs/docsite.html.mustache
@@ -12,7 +12,7 @@
   <meta name="viewport" content="width=device-width, initial-scale=1.0">
   <link rel="shortcut icon" href="{{topdots}}pants-logo.ico">
   <!-- In case this is a "test publish", tell search engines where real version lives: -->
-  <link rel="canonical" href="https://pantsbuild.github.io/{{page_path}}.html">
+  <link rel="canonical" href="http://pantsbuild.org/{{page_path}}.html">
 
   <link rel="stylesheet" href="{{topdots}}bootstrap-custom.min.css">
   <link rel="stylesheet" href="{{topdots}}bootstrap-custom-theme.min.css">
@@ -47,7 +47,7 @@
             <form class="navbar-form navbar-left search" role="search" action="https://www.google.com/search">
               <div class="form-group">
                 <input type="text" name="as_q" class="form-control query" placeholder="Search">
-                <input name="as_sitesearch" value="pantsbuild.github.io" type="hidden">
+                <input name="as_sitesearch" value="pantsbuild.org" type="hidden">
               </div>
             </form>
           </li>
@@ -103,7 +103,7 @@
             <!-- main content end -->
 
             <div class="generated">
-              Generated by <a href="http://pantsbuild.github.io/docs.html">publish_docs</a>
+              Generated by <a href="http://pantsbuild.org/docs.html">publish_docs</a>
               from {{generated}}
             </div>
 
diff --git a/src/python/pants/README.md b/src/python/pants/README.md
index a388e4c5460..90fc12ab89d 100644
--- a/src/python/pants/README.md
+++ b/src/python/pants/README.md
@@ -1 +1 @@
-[Pants documentation](http://pantsbuild.github.io/) has moved...
+[Pants documentation](http://pantsbuild.org/) has moved...
diff --git a/src/python/pants/backend/README.md b/src/python/pants/backend/README.md
index 31b7d38b4a9..819425a560d 100644
--- a/src/python/pants/backend/README.md
+++ b/src/python/pants/backend/README.md
@@ -1,5 +1,5 @@
 /src/python/pants/backend/
 
 Some Pants functionality can live in "plugins", as described at,
-http://pantsbuild.github.io/howto_plugin.html . This code defines plugins normally built into
+http://pantsbuild.org/howto_plugin.html . This code defines plugins normally built into
 Pants itself. Most of the Pants code lives here.
diff --git a/src/python/pants/backend/python/README.md b/src/python/pants/backend/python/README.md
index 40dc99df898..4a2c276e9ea 100644
--- a/src/python/pants/backend/python/README.md
+++ b/src/python/pants/backend/python/README.md
@@ -1 +1 @@
-[Pants documentation](http://pantsbuild.github.io/python-readme.html) has moved...
+[Pants documentation](http://pantsbuild.org/python-readme.html) has moved...