diff --git a/CHANGELOG.md b/CHANGELOG.md
index fa592ed27a..6bfd746bb3 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,62 @@
+<a name="0.6.0"></a>
+# [0.6.0](https://github.com/garden-io/garden/compare/v0.5.0...v0.6.0) (2018-09-10)
+
+
+### Bug Fixes
+
+* **call-command:** print correct protocol ([d973058](https://github.com/garden-io/garden/commit/d973058))
+* **cli:** allow empty path when calling services via `garden call` ([b5d4972](https://github.com/garden-io/garden/commit/b5d4972))
+* **cli:** show ANSI banner image instead of png in dev command ([bb3898f](https://github.com/garden-io/garden/commit/bb3898f))
+* **cli:** task results errors weren't handled properly ([b22b580](https://github.com/garden-io/garden/commit/b22b580))
+* **config:** remove name field from service endpoint spec ([9f6f9f0](https://github.com/garden-io/garden/commit/9f6f9f0))
+* **examples:** unused import in go-service ([25509cf](https://github.com/garden-io/garden/commit/25509cf))
+* **k8s:** build status was incorrectly reported for helm modules ([195eee4](https://github.com/garden-io/garden/commit/195eee4))
+* **k8s:** don't deploy system services when running minikube ([215cabd](https://github.com/garden-io/garden/commit/215cabd))
+* **k8s:** wait for Tiller pod to be ready when initializing ([a5cd8eb](https://github.com/garden-io/garden/commit/a5cd8eb)), closes [#228](https://github.com/garden-io/garden/issues/228)
+* **logger:** ensure ansi chars in section don't break format ([323b6e9](https://github.com/garden-io/garden/commit/323b6e9))
+* **multi-repo:** ensure external source gets updated if repo url changes ([881c3c7](https://github.com/garden-io/garden/commit/881c3c7))
+* **openfaas:** external endpoints had incorrect path ([64de898](https://github.com/garden-io/garden/commit/64de898))
+* **publish-script:** set remote in git push command ([aa03557](https://github.com/garden-io/garden/commit/aa03557))
+* add axios as dependency (was dev dependency) ([4ccdfd8](https://github.com/garden-io/garden/commit/4ccdfd8))
+* catch and log task errors as they happen ([46eef92](https://github.com/garden-io/garden/commit/46eef92))
+* fix ignore package import ([00721c3](https://github.com/garden-io/garden/commit/00721c3))
+* fix publish script ([7d84751](https://github.com/garden-io/garden/commit/7d84751))
+* init file writers in Garden class ([d982b66](https://github.com/garden-io/garden/commit/d982b66))
+* **tests:** ensure test project is clean between tests ([b7f6664](https://github.com/garden-io/garden/commit/b7f6664))
+* **versioning:** `resolveVersion` should not call `getTreeVersion` ([91ae14f](https://github.com/garden-io/garden/commit/91ae14f))
+* **versioning:** version string should include dirty timestamp ([61d29d0](https://github.com/garden-io/garden/commit/61d29d0))
+
+
+### Code Refactoring
+
+* **config:** make module name mandatory ([aa83d7f](https://github.com/garden-io/garden/commit/aa83d7f))
+
+
+### Features
+
+* **k8s:** allow specifying namespace to deploy to ([0aebc2b](https://github.com/garden-io/garden/commit/0aebc2b))
+* add 'delete service' command ([2b067c6](https://github.com/garden-io/garden/commit/2b067c6))
+* add exec command, to run commands in running service containers ([7f74edc](https://github.com/garden-io/garden/commit/7f74edc))
+* add multi-repo support ([740e858](https://github.com/garden-io/garden/commit/740e858))
+* add OpenFaaS plugin (experimental) ([39ff701](https://github.com/garden-io/garden/commit/39ff701))
+* add Windows support (experimental) ([9e9c218](https://github.com/garden-io/garden/commit/9e9c218))
+* **k8s:** support custom hostnames and TLS certs ([1c004f7](https://github.com/garden-io/garden/commit/1c004f7))
+* **multi-repos:** allow file URLs ([c072dd9](https://github.com/garden-io/garden/commit/c072dd9))
+* allow configs from subdirectories ([bb464c3](https://github.com/garden-io/garden/commit/bb464c3))
+
+
+### BREAKING CHANGES
+
+* **config:** Endpoint names will have to be removed from module configs.
+* **config:** Module name no longer defaults to directory name but must be explicitly
+set in the module's garden.yml file. Any existing garden.yml module files
+without a name key must therefore be updated to expclitily provide the
+module name.
+
+
+
 <a name="0.5.0"></a>
-# [0.5.0](https://github.com/garden-io/garden/compare/v0.3.0...v0.5.0) (2018-09-05)
+# [0.5.0](https://github.com/garden-io/garden/compare/v0.4.0...v0.5.0) (2018-09-05)
 
 
 ### Bug Fixes
@@ -45,7 +102,7 @@ module name.
 
 
 <a name="0.4.0"></a>
-# [0.4.0](https://github.com/garden-io/garden/compare/v0.3.0...v0.4.0) (2018-08-14)
+# [0.4.0](https://github.com/garden-io/garden/compare/v0.3.1...v0.4.0) (2018-08-14)
 
 
 ### Bug Fixes
diff --git a/bin/publish b/bin/publish
index 4e75e5886f..a58f556d96 100755
--- a/bin/publish
+++ b/bin/publish
@@ -9,13 +9,21 @@ cd ${garden_root}
 lerna version --no-push
 git reset HEAD~1
 
-./node_modules/.bin/conventional-changelog -p angular -i CHANGELOG.md --commit-path . -s
-git add CHANGELOG.md
+# Note: conventional-changelog reads the current version from package.json and finds previous versions
+# by searching for the string  "tag:" within commit messages. It should therefore run after the
+# version is updated in package.json but before the change is commited and tagged.
+
+./node_modules/.bin/conventional-changelog -p angular -i CHANGELOG.md --commit-path . -s --pkg ./garden-cli
+git add .
 version=$(node -p "require('./lerna.json').version")
 git commit -m "chore(release): release ${version}"
 
+# We need to re-create the tag created by lerna since adding the changelog changes the commit hash
+git tag -d v${version}
+git tag -a v${version} -m "v${version}"
+
 git push --tags --no-verify
-git push --no-verify
+git push origin HEAD --no-verify
 
 # TODO: set this up to work with multiple packages
 cd garden-cli
diff --git a/garden-cli/gulpfile.ts b/garden-cli/gulpfile.ts
index fc3ce24ad9..23633a4d57 100644
--- a/garden-cli/gulpfile.ts
+++ b/garden-cli/gulpfile.ts
@@ -179,6 +179,7 @@ gulp.task("tslint-tests", () =>
  */
 gulp.task("update-brew", async () => {
   // clone the homebrew-garden tap repo
+  await ensureDir(tmpDir)
   const brewRepoDir = resolve(tmpDir, "homebrew-garden")
   if (await pathExists(brewRepoDir)) {
     await remove(brewRepoDir)
diff --git a/garden-cli/package.json b/garden-cli/package.json
index 43433eaeb8..70737f813e 100644
--- a/garden-cli/package.json
+++ b/garden-cli/package.json
@@ -1,6 +1,6 @@
 {
   "name": "garden-cli",
-  "version": "0.5.0",
+  "version": "0.6.0",
   "description": "A full-featured development framework for containers and serverless",
   "repository": {
     "type": "git",
diff --git a/lerna.json b/lerna.json
index ba4dc9e4f6..62a0b27f61 100644
--- a/lerna.json
+++ b/lerna.json
@@ -7,5 +7,5 @@
   "packages": [
     "garden-cli/"
   ],
-  "version": "0.5.0"
+  "version": "0.6.0"
 }
diff --git a/package.json b/package.json
index fd88b26ab6..a22aba0e6d 100644
--- a/package.json
+++ b/package.json
@@ -60,4 +60,4 @@
   },
   "snyk": true,
   "dependencies": {}
-}
\ No newline at end of file
+}