diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9eca32054..735aca7b8 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,13 @@
+## 0.4.0 (2015-06-04)
+
+Enhancements
+
+* Private and password-protected rooms
+* Private 1-to-1 chat between XMPP users
+* Giphy image search
+* @all mentions are highlighted for everyone
+* Basic server-side i18n support
+
 ## 0.3.13 (2015-05-29)
 
 Fixes
diff --git a/README.md b/README.md
index 520b1a5bc..078001df4 100644
--- a/README.md
+++ b/README.md
@@ -9,16 +9,19 @@ A self-hosted chat app for small teams built by [Security Compass][seccom].
 * BYOS (bring your own server)
 * Persistent messages
 * Multiple rooms
+* Private and password-protected rooms
 * New message alerts / notifications
-* Mentions (hey @you)
-* Image embeds
+* Mentions (hey @you/@all)
+* Image embeds / Giphy search
 * Code pasting
 * File uploads (Local / [Amazon S3][s3] / [Azure][azure])
 * Transcripts / chat history
 * XMPP Multi-user chat (MUC)
+* 1-to-1 chat between XMPP users
 * Local / [Kerberos][kerberos] / [LDAP][ldap] authentication
 * [Hubot Adapter][hubot]
 * REST-like API
+* Basic i18n support
 * MIT Licensed
 
 
diff --git a/locales/en.json b/locales/en.json
index 1d4080842..fc7b12b64 100644
--- a/locales/en.json
+++ b/locales/en.json
@@ -71,5 +71,8 @@
 	"Revoke token": "Revoke token",
 	"Your generated token is below. It will not be shown again.": "Your generated token is below. It will not be shown again.",
 	"Add Room": "Add Room",
-	"Slug": "Slug"
+	"Slug": "Slug",
+	"XMPP/Jabber": "XMPP/Jabber",
+	"Private?": "Private?",
+	"Empty for public room": "Empty for public room"
 }
\ No newline at end of file
diff --git a/package.json b/package.json
index a20681835..7169b1bd7 100644
--- a/package.json
+++ b/package.json
@@ -1,8 +1,8 @@
 {
   "name": "lets-chat",
-  "version": "0.3.13",
+  "version": "0.4.0",
   "description": "A chat app for small teams.",
-  "license" : "MIT",
+  "license": "MIT",
   "main": "app.js",
   "scripts": {
     "start": "node app.js",
@@ -97,6 +97,6 @@
     "grunt": "~0.4.5",
     "grunt-bower": "~0.19.0",
     "grunt-bower-task": "~0.4.0",
-    "eslint": "^0.21.2"
+    "eslint": "^0.22.1"
   }
 }