diff --git a/CHANGELOG.md b/CHANGELOG.md
index 430f2d0e..5b3e216a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,6 @@
 # Changelog
 
-## Unreleased
+## 0.8.4
 
 * Using `delete` on an import namespace object is now an error
 
@@ -17,7 +17,7 @@
 
     Code inside branching expressions where the branch is statically determined to never be taken is now marked as dead code. Previously this was only the case for statements, not expressions. This change means `false && require('pkg')` will no longer generate an error about `pkg` being missing even if it is indeed missing. This change affects the `||`, `&&`, `??`, and `?:` operators.
 
-* Fix metafile ([#504](https://github.com/evanw/esbuild/pull/504))
+* Fix metafile when importing CSS from JS ([#504](https://github.com/evanw/esbuild/pull/504))
 
     This release fixes a bug where importing a CSS file from JavaScript caused esbuild to generate invalid JSON in the resulting metafile. It was only a problem if you were importing CSS from JS and enabled metafile output. This fix was contributed by [@nitsky](https://github.com/nitsky).
 
diff --git a/Makefile b/Makefile
index d945afca..07d152da 100644
--- a/Makefile
+++ b/Makefile
@@ -115,7 +115,7 @@ test-otp:
 	test -n "$(OTP)" && echo publish --otp="$(OTP)"
 
 publish-all: cmd/esbuild/version.go test-all test-extra
-	@test master = "`git branch --show-current`" || (echo "Refusing to publish from non-master branch `git branch --show-current`" && false)
+	@test master = "`git rev-parse --abbrev-ref HEAD`" || (echo "Refusing to publish from non-master branch `git rev-parse --abbrev-ref HEAD`" && false)
 	@echo "Checking for unpushed commits..." && git fetch
 	@test "" = "`git cherry`" || (echo "Refusing to publish with unpushed commits" && false)
 	rm -fr npm && git checkout npm
diff --git a/cmd/esbuild/version.go b/cmd/esbuild/version.go
index 142523c7..0099358f 100644
--- a/cmd/esbuild/version.go
+++ b/cmd/esbuild/version.go
@@ -1,3 +1,3 @@
 package main
 
-const esbuildVersion = "0.8.3"
+const esbuildVersion = "0.8.4"
diff --git a/npm/esbuild-darwin-64/package.json b/npm/esbuild-darwin-64/package.json
index 18b512a5..e1224496 100644
--- a/npm/esbuild-darwin-64/package.json
+++ b/npm/esbuild-darwin-64/package.json
@@ -1,6 +1,6 @@
 {
   "name": "esbuild-darwin-64",
-  "version": "0.8.3",
+  "version": "0.8.4",
   "description": "The macOS 64-bit binary for esbuild, a JavaScript bundler.",
   "repository": "https://github.com/evanw/esbuild",
   "license": "MIT",
diff --git a/npm/esbuild-freebsd-64/package.json b/npm/esbuild-freebsd-64/package.json
index a6a80605..902076aa 100644
--- a/npm/esbuild-freebsd-64/package.json
+++ b/npm/esbuild-freebsd-64/package.json
@@ -1,6 +1,6 @@
 {
   "name": "esbuild-freebsd-64",
-  "version": "0.8.3",
+  "version": "0.8.4",
   "description": "The FreeBSD 64-bit binary for esbuild, a JavaScript bundler.",
   "repository": "https://github.com/evanw/esbuild",
   "license": "MIT",
diff --git a/npm/esbuild-freebsd-arm64/package.json b/npm/esbuild-freebsd-arm64/package.json
index e967c63b..f5c17915 100644
--- a/npm/esbuild-freebsd-arm64/package.json
+++ b/npm/esbuild-freebsd-arm64/package.json
@@ -1,6 +1,6 @@
 {
   "name": "esbuild-freebsd-arm64",
-  "version": "0.8.3",
+  "version": "0.8.4",
   "description": "The FreeBSD ARM 64-bit binary for esbuild, a JavaScript bundler.",
   "repository": "https://github.com/evanw/esbuild",
   "license": "MIT",
diff --git a/npm/esbuild-linux-32/package.json b/npm/esbuild-linux-32/package.json
index 27ed7201..d96eb978 100644
--- a/npm/esbuild-linux-32/package.json
+++ b/npm/esbuild-linux-32/package.json
@@ -1,6 +1,6 @@
 {
   "name": "esbuild-linux-32",
-  "version": "0.8.3",
+  "version": "0.8.4",
   "description": "The Linux 32-bit binary for esbuild, a JavaScript bundler.",
   "repository": "https://github.com/evanw/esbuild",
   "license": "MIT",
diff --git a/npm/esbuild-linux-64/package.json b/npm/esbuild-linux-64/package.json
index c85b5dee..cf70ebad 100644
--- a/npm/esbuild-linux-64/package.json
+++ b/npm/esbuild-linux-64/package.json
@@ -1,6 +1,6 @@
 {
   "name": "esbuild-linux-64",
-  "version": "0.8.3",
+  "version": "0.8.4",
   "description": "The Linux 64-bit binary for esbuild, a JavaScript bundler.",
   "repository": "https://github.com/evanw/esbuild",
   "license": "MIT",
diff --git a/npm/esbuild-linux-arm64/package.json b/npm/esbuild-linux-arm64/package.json
index 8d844a38..4cd42575 100644
--- a/npm/esbuild-linux-arm64/package.json
+++ b/npm/esbuild-linux-arm64/package.json
@@ -1,6 +1,6 @@
 {
   "name": "esbuild-linux-arm64",
-  "version": "0.8.3",
+  "version": "0.8.4",
   "description": "The Linux ARM 64-bit binary for esbuild, a JavaScript bundler.",
   "repository": "https://github.com/evanw/esbuild",
   "license": "MIT",
diff --git a/npm/esbuild-linux-ppc64le/package.json b/npm/esbuild-linux-ppc64le/package.json
index ede7561a..7e86c188 100644
--- a/npm/esbuild-linux-ppc64le/package.json
+++ b/npm/esbuild-linux-ppc64le/package.json
@@ -1,6 +1,6 @@
 {
   "name": "esbuild-linux-ppc64le",
-  "version": "0.8.3",
+  "version": "0.8.4",
   "description": "The Linux PowerPC 64-bit Little Endian binary for esbuild, a JavaScript bundler.",
   "repository": "https://github.com/evanw/esbuild",
   "license": "MIT",
diff --git a/npm/esbuild-wasm/package.json b/npm/esbuild-wasm/package.json
index 090be0cf..d94085b4 100644
--- a/npm/esbuild-wasm/package.json
+++ b/npm/esbuild-wasm/package.json
@@ -1,6 +1,6 @@
 {
   "name": "esbuild-wasm",
-  "version": "0.8.3",
+  "version": "0.8.4",
   "description": "The cross-platform WebAssembly binary for esbuild, a JavaScript bundler.",
   "repository": "https://github.com/evanw/esbuild",
   "license": "MIT",
diff --git a/npm/esbuild-windows-32/package.json b/npm/esbuild-windows-32/package.json
index 1b47552d..f8fe57e9 100644
--- a/npm/esbuild-windows-32/package.json
+++ b/npm/esbuild-windows-32/package.json
@@ -1,6 +1,6 @@
 {
   "name": "esbuild-windows-32",
-  "version": "0.8.3",
+  "version": "0.8.4",
   "description": "The Windows 32-bit binary for esbuild, a JavaScript bundler.",
   "repository": "https://github.com/evanw/esbuild",
   "license": "MIT",
diff --git a/npm/esbuild-windows-64/package.json b/npm/esbuild-windows-64/package.json
index f407e2b5..6ae3b324 100644
--- a/npm/esbuild-windows-64/package.json
+++ b/npm/esbuild-windows-64/package.json
@@ -1,6 +1,6 @@
 {
   "name": "esbuild-windows-64",
-  "version": "0.8.3",
+  "version": "0.8.4",
   "description": "The Windows 64-bit binary for esbuild, a JavaScript bundler.",
   "repository": "https://github.com/evanw/esbuild",
   "license": "MIT",
diff --git a/npm/esbuild/package.json b/npm/esbuild/package.json
index 7c81ded2..230ebb49 100644
--- a/npm/esbuild/package.json
+++ b/npm/esbuild/package.json
@@ -1,6 +1,6 @@
 {
   "name": "esbuild",
-  "version": "0.8.3",
+  "version": "0.8.4",
   "description": "An extremely fast JavaScript bundler and minifier.",
   "repository": "https://github.com/evanw/esbuild",
   "scripts": {
diff --git a/version.txt b/version.txt
index ee94dd83..b60d7196 100644
--- a/version.txt
+++ b/version.txt
@@ -1 +1 @@
-0.8.3
+0.8.4