diff --git a/HISTORY.md b/HISTORY.md
index fddff103f..dcb88c8f9 100644
--- a/HISTORY.md
+++ b/HISTORY.md
@@ -1,5 +1,17 @@
 # History
 
+## 0.3.21
+
+This release fixes an issue with installing buildstep and dokku.
+
+### New Features
+
+- #1256: @alessio Log all dokku events to /var/log/dokku/events.log
+
+### Bug Fixes
+
+- #1269: @josegonzalez Peg lxc-docker in buildstep to 1.6.2
+
 ## 0.3.20
 
 This release pegs Dokku to Docker 1.6.2. Docker 1.7.0 introduced changes in `docker ps` which cause incompatibilities with many popular dokku plugins.
diff --git a/README.md b/README.md
index d2d3ef2b3..d782cd614 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.20/bootstrap.sh
-    sudo DOKKU_TAG=v0.3.20 bash bootstrap.sh
+    wget https://raw.github.com/progrium/dokku/v0.3.21/bootstrap.sh
+    sudo DOKKU_TAG=v0.3.21 bash bootstrap.sh
 
 ### Upgrading
 
diff --git a/contrib/dokku-installer.rb b/contrib/dokku-installer.rb
index f05e04fb9..ef5f2e7b3 100755
--- a/contrib/dokku-installer.rb
+++ b/contrib/dokku-installer.rb
@@ -21,7 +21,7 @@ if ARGV[0] == "onboot"
   exit
 end
 
-version   = "v0.3.20"
+version   = "v0.3.21"
 dokku_root  = ENV["DOKKU_ROOT"] || "/home/dokku"
 admin_key   = `cat /root/.ssh/authorized_keys`.split("\n").first
 hostname  = `bash -c '[[ $(dig +short $HOSTNAME) ]] && echo $HOSTNAME || curl icanhazip.com'`.strip
diff --git a/docs/installation.md b/docs/installation.md
index a25a26a72..4f905eb99 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.20/bootstrap.sh
-sudo DOKKU_TAG=v0.3.20 bash bootstrap.sh
+wget https://raw.github.com/progrium/dokku/v0.3.21/bootstrap.sh
+sudo DOKKU_TAG=v0.3.21 bash bootstrap.sh
 
 # Go to your server's IP and follow the web installer
 ```