diff --git a/README.md b/README.md
index 2524a525..0518fd62 100644
--- a/README.md
+++ b/README.md
@@ -3,6 +3,6 @@ understanding-json-schema
 
 A website aiming to provide more accessible documentation for JSON schema.
 
-http://spacetelescope.github.io/understanding-json-schema/index.html
+http://json-schema.org/understanding-json-schema/index.html
 
-[![Build Status](https://travis-ci.org/spacetelescope/understanding-json-schema.png)](https://travis-ci.org/spacetelescope/understanding-json-schema)
+[![Build Status](https://travis-ci.org/json-schema-org/understanding-json-schema.png)](https://travis-ci.org/json-schema-org/understanding-json-schema)
diff --git a/source/_templates/layout.html b/source/_templates/layout.html
index 9e30c8ed..353db607 100644
--- a/source/_templates/layout.html
+++ b/source/_templates/layout.html
@@ -10,7 +10,7 @@
 
 {% block header %}
   {{ super() }}
-  <a href="https://github.com/spacetelescope/understanding-json-schema"
+  <a href="https://github.com/json-schema-org/understanding-json-schema"
      class="visible-desktop"><img
     style="position: absolute; z-index: 10; top: 40px; right: 0; border: 0;"
     src="https://s3.amazonaws.com/github/ribbons/forkme_right_white_ffffff.png"
diff --git a/source/conf.py b/source/conf.py
index c7c8468b..38af757a 100644
--- a/source/conf.py
+++ b/source/conf.py
@@ -55,7 +55,7 @@
 
 # General information about the project.
 project = u'Understanding JSON Schema'
-copyright = u'2013-{0}, Michael Droettboom, Space Telescope Science Institute'.format(
+copyright = u'2013-2016 Michael Droettboom, Space Telescope Science Institute; © 2016-{0} Michael Droettboom'.format(
     datetime.datetime.now().year)
 
 # The version info for the project you're documenting, acts as replacement for
diff --git a/source/index.rst b/source/index.rst
index 0154936c..8e864d0d 100644
--- a/source/index.rst
+++ b/source/index.rst
@@ -67,7 +67,7 @@ validator---just yet.
 .. only:: html
 
    There is also a `print version of this document
-   <http://spacetelescope.github.io/understanding-json-schema/UnderstandingJSONSchema.pdf>`__.
+   <http://json-schema.org/understanding-json-schema/UnderstandingJSONSchema.pdf>`__.
 
 .. toctree::
    :maxdepth: 1