diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 9e47481c5..ecb231f92 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -2,7 +2,7 @@
## Development environment
-If you're looking contribute to [Fig](http://orchardup.github.io/fig/)
+If you're looking contribute to [Fig](http://www.fig.sh/)
but you're new to the project or maybe even to Python, here are the steps
that should get you started.
diff --git a/README.md b/README.md
index 9e7e4fc40..924232185 100644
--- a/README.md
+++ b/README.md
@@ -46,4 +46,4 @@ Fig is a project from [Orchard](https://orchardup.com), a Docker hosting service
Installation and documentation
------------------------------
-Full documentation is available on [Fig's website](http://orchardup.github.io/fig/).
+Full documentation is available on [Fig's website](http://www.fig.sh/).
diff --git a/docs/_layouts/default.html b/docs/_layouts/default.html
index 6ba5651cd..b4b710b42 100644
--- a/docs/_layouts/default.html
+++ b/docs/_layouts/default.html
@@ -7,6 +7,7 @@
+
diff --git a/docs/django.md b/docs/django.md
index a7ef33cf1..3219312c0 100644
--- a/docs/django.md
+++ b/docs/django.md
@@ -39,7 +39,7 @@ Simple enough. Finally, this is all tied together with a file called `fig.yml`.
links:
- db
-See the [`fig.yml` reference](http://orchardup.github.io/fig/yml.html) for more information on how it works.
+See the [`fig.yml` reference](yml.html) for more information on how it works.
We can now start a Django project using `fig run`:
diff --git a/setup.py b/setup.py
index 1f196baf6..02f4d8265 100644
--- a/setup.py
+++ b/setup.py
@@ -32,7 +32,7 @@ setup(
name='fig',
version=find_version("fig", "__init__.py"),
description='Punctual, lightweight development environments using Docker',
- url='http://orchardup.github.io/fig/',
+ url='http://www.fig.sh/',
author='Orchard Laboratories Ltd.',
author_email='hello@orchardup.com',
license='Apache License 2.0',