diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 99f2fb068..d9b814f71 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -7,7 +7,7 @@ Dokku loves to welcome your contributions. There are several ways to help out:
 * Write test cases for open bug issues
 * Write patches for open bug/feature issues, preferably with test cases
   included
-* Contribute to the [documentation](http://progrium.viewdocs.io/dokku/)
+* Contribute to the [documentation](http://dokku.viewdocs.io/dokku/)
 
 There are a few guidelines that we need contributors to follow so that we have
 a chance of keeping on top of things.
@@ -41,7 +41,7 @@ encounter an issue. We always appreciate a well-written, thorough bug report,
 and will thank you for it!
 
 Sometimes dokku is missing a feature you need. In some cases, those features can
-be found in pre-existing [plugins](http://progrium.viewdocs.io/dokku/plugins/),
+be found in pre-existing [plugins](http://dokku.viewdocs.io/dokku/plugins/),
 and we encourage our users to create and contribute such packages. From time to
 time, we will also pull plugins into the dokku core when the task they solve is
 a common one for our users.
@@ -186,7 +186,7 @@ To run the shellcheck sniffs for Dokku coding standards:
     make ci-dependencies
     make lint
 
-The [testing docs](http://progrium.viewdocs.io/dokku/development/testing/)
+The [testing docs](http://dokku.viewdocs.io/dokku/development/testing/)
 contains installation info for bats and shellcheck.
 
 # Additional Resources
diff --git a/HISTORY.md b/HISTORY.md
index fef276a29..02f3ab3c6 100644
--- a/HISTORY.md
+++ b/HISTORY.md
@@ -243,9 +243,9 @@ One new feature is colorized logging output, which should make it easier to debu
 
 This is our first minor release in almost a year. Many new features and removals have occurred, so here is a neat summary:
 
-- Plugins are now triggered via `plugn`. Notably, you'll need add a `plugin.toml` to describe the plugin as well as use `plugn trigger` instead of `pluginhook` to trigger plugin callbacks. Please see the [plugin creation documentation](http://progrium.viewdocs.io/dokku/development/plugin-creation/) for more details.
-- A few new official plugins have been added to the core, including [image tagging](http://progrium.viewdocs.io/dokku/application-deployment/), [certificate management](http://progrium.viewdocs.io/dokku/deployment/ssl-configuration/), a tar-based deploy solution, and much more. Check out the *New Features* section for more details.
-- We've removed a few deprecated plugin callbacks. Please see the [plugin triggers documentation](http://progrium.viewdocs.io/dokku/development/plugin-triggers/) to see what is available.
+- Plugins are now triggered via `plugn`. Notably, you'll need add a `plugin.toml` to describe the plugin as well as use `plugn trigger` instead of `pluginhook` to trigger plugin callbacks. Please see the [plugin creation documentation](http://dokku.viewdocs.io/dokku/development/plugin-creation/) for more details.
+- A few new official plugins have been added to the core, including [image tagging](http://dokku.viewdocs.io/dokku/application-deployment/), [certificate management](http://dokku.viewdocs.io/dokku/deployment/ssl-configuration/), a tar-based deploy solution, and much more. Check out the *New Features* section for more details.
+- We've removed a few deprecated plugin callbacks. Please see the [plugin triggers documentation](http://dokku.viewdocs.io/dokku/development/plugin-triggers/) to see what is available.
 - [Official datastorage plugins](https://github.com/dokku) have been created for the most commonly used datastores. If you previously used/maintained a community contributed plugin, please check these out. We'll be adding more official plugins as time goes on.
 
 Thanks to the *many* contributors for making this release our best release so far, and special thanks to both @michaelshobbs and @Flink for pushing along the `0.4.0` release!
@@ -354,7 +354,7 @@ This release is a bugfix release covering dokku packaging.
 
 ## 0.3.23
 
-This release is a bugfix release mostly covering installation and nginx issues. As well, we launched a nicer documentation site [here](http://progrium.viewdocs.io/dokku/). Thanks to all of our contributors for making this a great release!
+This release is a bugfix release mostly covering installation and nginx issues. As well, we launched a nicer documentation site [here](http://dokku.viewdocs.io/dokku/). Thanks to all of our contributors for making this a great release!
 
 ### Bug Fixes
 
diff --git a/Makefile b/Makefile
index 6a01a2d55..724ab66a7 100644
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,6 @@
 DOKKU_VERSION = master
 
-SSHCOMMAND_URL ?= https://raw.githubusercontent.com/progrium/sshcommand/master/sshcommand
+SSHCOMMAND_URL ?= https://raw.githubusercontent.com/dokku/sshcommand/master/sshcommand
 PLUGN_URL ?= https://github.com/dokku/dokku/releases/download/v0.4.0/plugn_0.2.0_linux_x86_64.tgz
 STACK_URL ?= https://github.com/gliderlabs/herokuish.git
 PREBUILT_STACK_URL ?= gliderlabs/herokuish:latest
diff --git a/bootstrap.sh b/bootstrap.sh
index 5dcad8db3..1ac0a260b 100755
--- a/bootstrap.sh
+++ b/bootstrap.sh
@@ -20,7 +20,7 @@ export DOKKU_REPO=${DOKKU_REPO:-"https://github.com/dokku/dokku.git"}
 
 echo "Preparing to install $DOKKU_TAG from $DOKKU_REPO..."
 if ! command -v apt-get &>/dev/null; then
-  echo "This installation script requires apt-get. For manual installation instructions, consult http://progrium.viewdocs.io/dokku/advanced-installation ."
+  echo "This installation script requires apt-get. For manual installation instructions, consult http://dokku.viewdocs.io/dokku/advanced-installation/"
   exit 1
 fi
 
@@ -53,7 +53,7 @@ dokku_install_package() {
   echo "--> Installing docker"
   if uname -r | grep -q linode; then
     echo "--> NOTE: Using Linode? Docker might complain about missing AUFS support."
-    echo "    See http://progrium.viewdocs.io/dokku/getting-started/install/linode/"
+    echo "    See http://dokku.viewdocs.io/dokku/getting-started/install/linode/"
     echo "    Installation will continue in 10 seconds."
     sleep 10
   fi
diff --git a/contrib/dokku-installer.rb b/contrib/dokku-installer.rb
index 8b8561493..4762105c8 100755
--- a/contrib/dokku-installer.rb
+++ b/contrib/dokku-installer.rb
@@ -110,7 +110,7 @@ __END__
       $.post('/setup', data)
         .done(function() {
           $("#result").html("Success!")
-          window.location.href = "http://progrium.viewdocs.io/dokku/application-deployment";
+          window.location.href = "http://dokku.viewdocs.io/dokku/application-deployment";
         })
         .fail(function(data) {
           $("#result").html("Something went wrong...")
diff --git a/deb.mk b/deb.mk
index 732f85055..83c8f7ab5 100644
--- a/deb.mk
+++ b/deb.mk
@@ -9,13 +9,13 @@ DOKKU_REPO_NAME ?= dokku/dokku
 DOKKU_ARCHITECTURE = amd64
 
 PLUGN_DESCRIPTION = 'Hook system that lets users extend your application with plugins'
-PLUGN_REPO_NAME ?= progrium/plugn
+PLUGN_REPO_NAME ?= dokku/plugn
 PLUGN_VERSION ?= 0.2.0
 PLUGN_ARCHITECTURE = amd64
 PLUGN_PACKAGE_NAME = plugn_$(PLUGN_VERSION)_$(PLUGN_ARCHITECTURE).deb
 
 SSHCOMMAND_DESCRIPTION = 'Turn SSH into a thin client specifically for your app'
-SSHCOMMAND_REPO_NAME ?= progrium/sshcommand
+SSHCOMMAND_REPO_NAME ?= dokku/sshcommand
 SSHCOMMAND_VERSION ?= 0.1.0
 SSHCOMMAND_ARCHITECTURE = amd64
 SSHCOMMAND_PACKAGE_NAME = sshcommand_$(SSHCOMMAND_VERSION)_$(SSHCOMMAND_ARCHITECTURE).deb
@@ -129,10 +129,10 @@ deb-plugn: deb-setup
 	sudo apt-get clean
 	sudo apt-get update -qq > /dev/null
 	sudo apt-get install -qq -y git golang mercurial > /dev/null 2>&1
-	export PATH=$(PATH):$(GOROOT)/bin:$(GOPATH)/bin && export GOROOT=$(GOROOT) && export GOPATH=$(GOPATH):/tmp/tmp/plugn && go get github.com/progrium/plugn
-	export PATH=$(PATH):$(GOROOT)/bin:$(GOPATH)/bin && export GOROOT=$(GOROOT) && export GOPATH=$(GOPATH):/tmp/tmp/plugn && cd /home/vagrant/gocode/src/github.com/progrium/plugn && make deps
-	export PATH=$(PATH):$(GOROOT)/bin:$(GOPATH)/bin && export GOROOT=$(GOROOT) && export GOPATH=$(GOPATH):/tmp/tmp/plugn && cd /home/vagrant/gocode/src/github.com/progrium/plugn && rm plugn && go build -o plugn
-	mv /home/vagrant/gocode/src/github.com/progrium/plugn/plugn /tmp/build/usr/local/bin/plugn
+	export PATH=$(PATH):$(GOROOT)/bin:$(GOPATH)/bin && export GOROOT=$(GOROOT) && export GOPATH=$(GOPATH):/tmp/tmp/plugn && go get github.com/dokku/plugn
+	export PATH=$(PATH):$(GOROOT)/bin:$(GOPATH)/bin && export GOROOT=$(GOROOT) && export GOPATH=$(GOPATH):/tmp/tmp/plugn && cd /home/vagrant/gocode/src/github.com/dokku/plugn && make deps
+	export PATH=$(PATH):$(GOROOT)/bin:$(GOPATH)/bin && export GOROOT=$(GOROOT) && export GOPATH=$(GOPATH):/tmp/tmp/plugn && cd /home/vagrant/gocode/src/github.com/dokku/plugn && rm plugn && go build -o plugn
+	mv /home/vagrant/gocode/src/github.com/dokku/plugn/plugn /tmp/build/usr/local/bin/plugn
 
 	echo "-> Creating $(PLUGN_PACKAGE_NAME)"
 	sudo fpm -t deb -s dir -C /tmp/build -n plugn -v $(PLUGN_VERSION) -a $(PLUGN_ARCHITECTURE) -p $(PLUGN_PACKAGE_NAME) --url "https://github.com/$(PLUGN_REPO_NAME)" --description $(PLUGN_DESCRIPTION) --license 'MIT License' .
diff --git a/docs/components.md b/docs/components.md
index fc43b9a91..91ee33ecc 100644
--- a/docs/components.md
+++ b/docs/components.md
@@ -2,7 +2,7 @@
 
  * [Docker](https://github.com/dotcloud/docker) - Container runtime and manager
  * [Herokuish](https://github.com/gliderlabs/herokuish) - Buildpack builder
- * [plugn](https://github.com/progrium/plugn) - Shell based plugins and hooks
- * [sshcommand](https://github.com/progrium/sshcommand) - Fixed commands over SSH
+ * [plugn](https://github.com/dokku/plugn) - Shell based plugins and hooks
+ * [sshcommand](https://github.com/dokku/sshcommand) - Fixed commands over SSH
 
 Looking to keep codebase as simple and hackable as possible, so try to keep your line count down.
diff --git a/docs/deployment/images.md b/docs/deployment/images.md
index 98890f55b..9b3602545 100644
--- a/docs/deployment/images.md
+++ b/docs/deployment/images.md
@@ -33,7 +33,7 @@ root@dokku:~# dokku tags:deploy node-js-app v0.9.0
 -----> Deploying node-js-app (dokku/node-js-app:v0.9.0)...
 -----> Running pre-flight checks
        For more efficient zero downtime deployments, create a file CHECKS.
-       See http://progrium.viewdocs.io/dokku/checks-examples.md for examples
+       See http://dokku.viewdocs.io/dokku/checks-examples.md for examples
        CHECKS file not found in container: Running simple container check...
 -----> Waiting for 10 seconds ...
 -----> Default container check successful!
diff --git a/docs/development/plugin-creation.md b/docs/development/plugin-creation.md
index 7c5c1a9cf..2791cafc2 100644
--- a/docs/development/plugin-creation.md
+++ b/docs/development/plugin-creation.md
@@ -3,9 +3,9 @@
 If you create your own plugin:
 
 1. Take a look at the plugins shipped with dokku and hack away!
-2. Check out the [list of triggers](http://progrium.viewdocs.io/dokku/development/plugin-triggers) your plugin can implement.
+2. Check out the [list of triggers](http://dokku.viewdocs.io/dokku/development/plugin-triggers) your plugin can implement.
 3. Upload your plugin to github with a repository name in form of `dokku-<name>` (e.g. `dokku-mariadb`)
-4. Edit [this page](http://progrium.viewdocs.io/dokku/plugins) and add a link to it.
+4. Edit [this page](http://dokku.viewdocs.io/dokku/plugins) and add a link to it.
 5. Subscribe to the [dokku development blog](http://progrium.com) to be notified about API changes and releases
 
 ### Sample plugin
@@ -89,4 +89,4 @@ A few notes:
   dokku config:unset --no-restart APP KEY1 [KEY2 ...]
   ```
 - From time to time you may want to allow other plugins access to (some of) your plugin's functionality. You can expose this by including a `functions` file in your plugin for others to source. Consider all functions in that file to be publicly accessible by other plugins. Any functions not wished to be made "public" should reside within your plugin trigger or commands files.
-- As of 0.4.0, we allow image tagging and deployment of said tagged images. Therefore, hard-coding of `$IMAGE` as `dokku/$APP` is no longer sufficient. Instead, for non `pre/post-build-*` plugins, use `get_running_image_tag()` & `get_app_image_name()` as sourced from common/functions. See the [plugin triggers](http://progrium.viewdocs.io/dokku/development/plugin-triggers) doc for examples.
+- As of 0.4.0, we allow image tagging and deployment of said tagged images. Therefore, hard-coding of `$IMAGE` as `dokku/$APP` is no longer sufficient. Instead, for non `pre/post-build-*` plugins, use `get_running_image_tag()` & `get_app_image_name()` as sourced from common/functions. See the [plugin triggers](http://dokku.viewdocs.io/dokku/development/plugin-triggers) doc for examples.
diff --git a/docs/development/plugin-triggers.md b/docs/development/plugin-triggers.md
index cf71ac7f9..903d65c6e 100644
--- a/docs/development/plugin-triggers.md
+++ b/docs/development/plugin-triggers.md
@@ -1,6 +1,6 @@
 # Plugin triggers
 
-[Plugin triggers](https://github.com/progrium/plugn) (formerly [pluginhooks](https://github.com/progrium/pluginhook)) are a good way to jack into existing dokku infrastructure. You can use them to modify the output of various dokku commands or override internal configuration.
+[Plugin triggers](https://github.com/dokku/plugn) (formerly [pluginhooks](https://github.com/progrium/pluginhook)) are a good way to jack into existing dokku infrastructure. You can use them to modify the output of various dokku commands or override internal configuration.
 
 Plugin triggers are simply scripts that are executed by the system. You can use any language you want, so long as the script:
 
diff --git a/docs/development/testing.md b/docs/development/testing.md
index b5dd94fac..e09802337 100644
--- a/docs/development/testing.md
+++ b/docs/development/testing.md
@@ -14,7 +14,7 @@ Example apps can be found here:
 
 ### Executing tests locally
 
-- Setup dokku in a [vagrant vm](http://progrium.viewdocs.io/dokku/getting-started/install/vagrant)
+- Setup dokku in a [vagrant vm](http://dokku.viewdocs.io/dokku/getting-started/install/vagrant)
 - Test setup and execution
 
   ```shell
diff --git a/docs/getting-started/install/linode.md b/docs/getting-started/install/linode.md
index ccc786589..8a75bb17c 100644
--- a/docs/getting-started/install/linode.md
+++ b/docs/getting-started/install/linode.md
@@ -36,4 +36,4 @@ __Warning__: These steps will delete *everything* on your Linode.
 
 9. Lastly, reboot the Linode.
 
-Once your server comes back online, you'll be running Ubuntu's default kernel. You can now follow Dokku's [normal installation instructions](http://progrium.viewdocs.io/dokku/installation) and `bootstrap.sh` will take care of everything else.
+Once your server comes back online, you'll be running Ubuntu's default kernel. You can now follow Dokku's [normal installation instructions](http://dokku.viewdocs.io/dokku/installation) and `bootstrap.sh` will take care of everything else.
diff --git a/docs/getting-started/where-to-get-help.md b/docs/getting-started/where-to-get-help.md
index c53d5dee2..2eee70ea3 100644
--- a/docs/getting-started/where-to-get-help.md
+++ b/docs/getting-started/where-to-get-help.md
@@ -4,7 +4,7 @@ If you’re stuck, there are a number of places you can get help:
 
 ## The Official Dokku Website
 
-[http://progrium.viewdocs.io/dokku](http://progrium.viewdocs.io/dokku)
+[http://dokku.viewdocs.io/dokku](http://dokku.viewdocs.io/dokku)
 
 The Official Dokku website is always a great place to visit. It features links to oft-used developer tools, community plugins, and guides on using dokku.
 
diff --git a/docs/installation.md b/docs/installation.md
index 4f0b42b18..b436a5f39 100644
--- a/docs/installation.md
+++ b/docs/installation.md
@@ -33,17 +33,17 @@ Once you save your settings, the web admin will self-terminate and you should be
 
 For various reasons, certain hosting providers may have other steps that should be preferred to the above. If hosted on any of the following popular hosts, please follow the linked to instructions:
 
-- [Digital Ocean Installation Notes](http://progrium.viewdocs.io/dokku/getting-started/install/digitalocean)
-- [Linode Installation Notes](http://progrium.viewdocs.io/dokku/getting-started/install/linode/)
-- [Microsoft Azure Installation Notes](http://progrium.viewdocs.io/dokku/getting-started/install/azure/)
+- [Digital Ocean Installation Notes](http://dokku.viewdocs.io/dokku/getting-started/install/digitalocean)
+- [Linode Installation Notes](http://dokku.viewdocs.io/dokku/getting-started/install/linode/)
+- [Microsoft Azure Installation Notes](http://dokku.viewdocs.io/dokku/getting-started/install/azure/)
 
 As well, you may wish to customize your installation in some other fashion. or experiment with vagrant. The guides below should get you started:
 
-- [Debian Package Installation Notes](http://progrium.viewdocs.io/dokku/getting-started/install/debian)
-- [Vagrant Installation Notes](http://progrium.viewdocs.io/dokku/getting-started/install/vagrant)
-- [Advanced Install Customization](http://progrium.viewdocs.io/dokku/advanced-installation)
+- [Debian Package Installation Notes](http://dokku.viewdocs.io/dokku/getting-started/install/debian)
+- [Vagrant Installation Notes](http://dokku.viewdocs.io/dokku/getting-started/install/vagrant)
+- [Advanced Install Customization](http://dokku.viewdocs.io/dokku/advanced-installation)
 
 ---
 
 - <sup>[1]: To check whether your system has an fqdn set, run `sudo hostname -f`</sup>
-- <sup>[2]: If your system has less than 1GB of memory, you can use ([this workaround](http://progrium.viewdocs.io/dokku/advanced-installation)).</sup>
+- <sup>[2]: If your system has less than 1GB of memory, you can use ([this workaround](http://dokku.viewdocs.io/dokku/advanced-installation)).</sup>
diff --git a/docs/plugins.md b/docs/plugins.md
index f12fecb6d..37ab1ca06 100644
--- a/docs/plugins.md
+++ b/docs/plugins.md
@@ -1,6 +1,6 @@
 # Plugins
 
-Dokku itself is built out of plugins and uses [plugn](https://github.com/progrium/plugn) for its plugin system. In essence a plugin is a collection of scripts that will be run based on naming convention.
+Dokku itself is built out of plugins and uses [plugn](https://github.com/dokku/plugn) for its plugin system. In essence a plugin is a collection of scripts that will be run based on naming convention.
 
 Let's take a quick look at the current dokku nginx plugin that's shipped with dokku by default.
 
@@ -26,7 +26,7 @@ dokku plugins-install
 
 ## Creating your own plugin
 
-[See the full documentation](http://progrium.viewdocs.io/dokku/development/plugin-creation).
+[See the full documentation](http://dokku.viewdocs.io/dokku/development/plugin-creation).
 
 ## Official Plugins (Beta)
 
diff --git a/docs/template.html b/docs/template.html
index 05e0c718d..9a54f9074 100644
--- a/docs/template.html
+++ b/docs/template.html
@@ -43,7 +43,7 @@
         <div class="row">
           <div class="col-md-offset-2">
             <h1 class="heading navbar-brand">
-              <a href="http://progrium.viewdocs.io/dokku/">Dokku</a>
+              <a href="http://dokku.viewdocs.io/dokku/">Dokku</a>
             </h1>
           </div>
         </div>
diff --git a/docs/upgrading.md b/docs/upgrading.md
index 9852a8a56..bc9f57428 100644
--- a/docs/upgrading.md
+++ b/docs/upgrading.md
@@ -1,6 +1,6 @@
 # Upgrading
 
-This document covers upgrades for the 0.3.0 series and up. If upgrading from older versions, we recommend [a fresh install](http://progrium.viewdocs.io/dokku/installation) on a new server.
+This document covers upgrades for the 0.3.0 series and up. If upgrading from older versions, we recommend [a fresh install](http://dokku.viewdocs.io/dokku/installation) on a new server.
 
 > As of 0.3.18, dokku is installed by default via a debian package. Source-based installations are still available, though not recommended.
 
diff --git a/plugins/checks/check-deploy b/plugins/checks/check-deploy
index 682ff96c9..d810dc524 100755
--- a/plugins/checks/check-deploy
+++ b/plugins/checks/check-deploy
@@ -85,7 +85,7 @@ if [[ ! -s "${TMPDIR}/CHECKS" ]] || [[ "$DOKKU_APP_CONTAINER_TYPE" != "web" ]];
     exit 0
   fi
   dokku_log_verbose "For more efficient zero downtime deployments, create a file CHECKS."
-  dokku_log_verbose "See http://progrium.viewdocs.io/dokku/checks-examples.md for examples"
+  dokku_log_verbose "See http://dokku.viewdocs.io/dokku/checks-examples.md for examples"
   dokku_log_verbose "CHECKS file not found in container: Running simple container check..."
 
   rm -rf $TMPDIR