diff --git a/HISTORY.md b/HISTORY.md
index dcb88c8f9..470fa5ff6 100644
--- a/HISTORY.md
+++ b/HISTORY.md
@@ -1,5 +1,47 @@
 # History
 
+## 0.3.22
+
+This release is a general bugfix release, with improvements to handling of nginx templates and application configuration.
+
+### Bug Fixes
+
+- #825: @andrewsomething Add support for multiple keys in the installer.
+- #1274: @michaelhobbs Parse correct section of path for `dokku ls` container type
+- #1289: @michaelhobbs Do not background container cleanup
+- #1298: @SonicHedgehog Fix check-deploy skipping the root path
+- #1300: @michaelhobbs Fix urls command when NO_VHOST=1
+- #1310: @michaelhobbs Use config:get for checks skipping variables
+- #1311: @michaelhobbs Ignore protocol of Dockerfile EXPOSE (refs: #1280)
+- #1312: @michaelhobbs Use docker inspect fordefault container check. Closes #1270
+- #1313: @michaelhobbs Verify we have an app when deploy is called. Closes #1309
+- #1319: @MWers Spelling fix: 'comma seperated'=>'comma-separated'
+- #1331: @alexkruegger Fix retrieval of nginx.conf.template app
+
+### New Features
+
+- #1149: @mlebkowski Add pluginhook to receive branches different than master
+- #1254: @kilianc Add DOKKU_DOCKERFILE_START_CMD support
+- #1261: @Flink Add the ability to skip checks (all or default)
+- #1277: @krokhale Add gzip to nginx templates by default
+- #1278: @assaf Add the ability to retrieve nginx template from app
+- #1291: @michaelhobbs Refactored interface for managing global/local app configuration
+- #1299: @SonicHedgehog Set X-Forwarded-Proto header if TLS is enabled when running checks
+
+### Docs Changes
+
+- #1273: @alessio Add docs for the events plugin
+- #1276: @josegonzalez Reorder and deprecate a few plugins
+- #1279: @josegonzalez Add docs for `receive-branch` hook. Refs #1149
+- #1282: @josegonzalez Move primecache to deprecated plugins
+- #1285: @josegonzalez Rename dokku-events-logs.md according to index.md
+- #1296: @Flink Add docker-auto-volumes to plugins
+- #1301: @mixxorz Add reset mtime plugin list
+- #1302: @fwolfst Mention where original nginx templates are found by default.
+- #1306: @josegonzalez Clarify web/cli installation docs. Closes #1177. Closes #1170
+- #1307: @josegonzalez Add release documentation. Closes #1287
+- #1324: @michaelhobbs Update docs to reflect default checks
+
 ## 0.3.21
 
 This release fixes an issue with installing buildstep and dokku.
diff --git a/README.md b/README.md
index d782cd614..c789e0808 100644
--- a/README.md
+++ b/README.md
@@ -10,8 +10,8 @@ Docker powered mini-Heroku. The smallest PaaS implementation you've ever seen. S
 
 To install the latest stable release, you can run the following commands as a user that has access to `sudo`:
 
-    wget https://raw.github.com/progrium/dokku/v0.3.21/bootstrap.sh
-    sudo DOKKU_TAG=v0.3.21 bash bootstrap.sh
+    wget https://raw.github.com/progrium/dokku/v0.3.22/bootstrap.sh
+    sudo DOKKU_TAG=v0.3.22 bash bootstrap.sh
 
 ### Upgrading
 
diff --git a/contrib/dokku-installer.rb b/contrib/dokku-installer.rb
index 9e40fe9ed..4ab26d835 100755
--- a/contrib/dokku-installer.rb
+++ b/contrib/dokku-installer.rb
@@ -21,7 +21,7 @@ if ARGV[0] == "onboot"
   exit
 end
 
-version   = "v0.3.21"
+version   = "v0.3.22"
 dokku_root  = ENV["DOKKU_ROOT"] || "/home/dokku"
 admin_keys  = `cat /root/.ssh/authorized_keys`.split("\n")
 hostname  = `bash -c '[[ $(dig +short $HOSTNAME) ]] && echo $HOSTNAME || curl icanhazip.com'`.strip
diff --git a/docs/installation.md b/docs/installation.md
index 1f8833aba..ce8148bb4 100644
--- a/docs/installation.md
+++ b/docs/installation.md
@@ -12,8 +12,8 @@ To install the latest stable version of dokku, you can run the following bootstr
 
 ```shell
 # installs dokku via apt-get
-wget https://raw.github.com/progrium/dokku/v0.3.21/bootstrap.sh
-sudo DOKKU_TAG=v0.3.21 bash bootstrap.sh
+wget https://raw.github.com/progrium/dokku/v0.3.22/bootstrap.sh
+sudo DOKKU_TAG=v0.3.22 bash bootstrap.sh
 
 # By default, this will do cli-based setup, though you may *also*
 # go to your server's IP and follow the web installer