diff --git a/CHANGELOG.md b/CHANGELOG.md
index e474170..9e8b26e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,4 +1,23 @@
-## 0.4.0 (unreleased)
+## 0.4.0
+
+- Adds query escaping when exporting results to CSV [GH-38]
+- Adds keyboard shortcut (ctrl+e, command+e on mac) for query explain action
+- Adds HTTP basic authentication with --auth-user and --auth-pass flags
+- Adds -skip-open/-s flag to disable automatic browser launch
+- Adds --bind option to specify server listen hostname/ip
+- Adds ssl mode parameters to url if ssl flag is set and not defined in the url
+- Adds dependency management with Godep
+- Adds Docker support
+- Adds Heroku support
+- Adds ability to connect to databases with no tables
+- Adds precompiled assets into repository to simplify development
+- Adds a connection details view
+- Adds a new interface to specify connection settings or make a new connection
+- Adds page favicon
+- Adds ability to present cell data as text area by double clicking on it
+- Fixes styles for query explain results
+- Fixes sidebar navigation scrolling styles [GH-12]
+- Fixes sidebar table name styles to support long names
 
 ## 0.3.1
 
diff --git a/main.go b/main.go
index e809abe..575d663 100644
--- a/main.go
+++ b/main.go
@@ -12,7 +12,7 @@ import (
 	_ "github.com/lib/pq"
 )
 
-const VERSION = "0.3.1"
+const VERSION = "0.4.0"
 
 var options struct {
 	Version  bool   `short:"v" long:"version" description:"Print version"`