diff --git a/CHANGELOG.md b/CHANGELOG.md
index 88eb94329..0ee7a2edc 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,8 +1,25 @@
 # Changelog
 
-## 0.4.0 (2016-09-26)
-
-TBD
+## 0.4.0 (2016-09-30)
+
+This release provides new functionality and some fixes:
+
+- Groups are now encoded in the JSON returned by the IAM /userinfo
+  endpoint as an array of group names.
+- Group information is also exposed by the token introspection endpoint
+- External authentication information (i.e. when a user authenticates with
+  Google or SAML instead of username/password) is now provided in the JSON
+  returned by the /userinfo endpoint
+- The first incarnation of the administrative dashboard is now included in the
+  service 
+- The first incarnation of the registration service is now included. The
+  registration service implements a "self-register with admin approval"
+  registration flow 
+- User passwords are now encoded in the database using the Bcrypt encoder
+- A password forgotten service is now provided
+
+More information about bug fixes and other developments can be found on
+our [JIRA release board][jira-v0.4.0]
 
 ## 0.3.0 (2016-07-12)
 
@@ -29,3 +46,4 @@ GitBook manual][gitbook-manual] or on [Github][github-doc].
 [token-exchange]: https://tools.ietf.org/html/draft-ietf-oauth-token-exchange-05
 [gitbook-manual]: https://www.gitbook.com/book/andreaceccanti/iam/details
 [github-doc]: https://github.com/indigo-iam/iam/blob/master/SUMMARY.md
+[jira-v0.4.0]: https://issues.infn.it/jira/browse/INDIAM/fixforversion/13811 
diff --git a/iam-common/pom.xml b/iam-common/pom.xml
index 57859c489..f3a682362 100644
--- a/iam-common/pom.xml
+++ b/iam-common/pom.xml
@@ -7,7 +7,7 @@
   <parent>
     <groupId>it.infn.mw</groupId>
     <artifactId>iam-parent</artifactId>
-    <version>0.4.0.rc2-SNAPSHOT</version>
+    <version>0.4.0</version>
   </parent>
 
   <artifactId>iam-common</artifactId>
diff --git a/iam-login-service/pom.xml b/iam-login-service/pom.xml
index e016366ce..48031681a 100644
--- a/iam-login-service/pom.xml
+++ b/iam-login-service/pom.xml
@@ -7,7 +7,7 @@
   <parent>
     <groupId>it.infn.mw</groupId>
     <artifactId>iam-parent</artifactId>
-    <version>0.4.0.rc2-SNAPSHOT</version>
+    <version>0.4.0</version>
   </parent>
 
   <artifactId>iam-login-service</artifactId>
diff --git a/iam-persistence/pom.xml b/iam-persistence/pom.xml
index 1166cfdea..418fe9633 100644
--- a/iam-persistence/pom.xml
+++ b/iam-persistence/pom.xml
@@ -7,7 +7,7 @@
   <parent>
     <groupId>it.infn.mw</groupId>
     <artifactId>iam-parent</artifactId>
-    <version>0.4.0.rc2-SNAPSHOT</version>
+    <version>0.4.0</version>
   </parent>
 
   <artifactId>iam-persistence</artifactId>
diff --git a/iam-test-client/pom.xml b/iam-test-client/pom.xml
index 31c7b2cf0..6a8bcc050 100644
--- a/iam-test-client/pom.xml
+++ b/iam-test-client/pom.xml
@@ -7,7 +7,7 @@
   <parent>
     <groupId>it.infn.mw</groupId>
     <artifactId>iam-parent</artifactId>
-    <version>0.4.0.rc2-SNAPSHOT</version>
+    <version>0.4.0</version>
   </parent>
 
   <artifactId>iam-test-client</artifactId>
diff --git a/iam-test-protected-resource/pom.xml b/iam-test-protected-resource/pom.xml
index 279d875c1..8b7df378b 100644
--- a/iam-test-protected-resource/pom.xml
+++ b/iam-test-protected-resource/pom.xml
@@ -7,7 +7,7 @@
   <parent>
     <groupId>it.infn.mw</groupId>
     <artifactId>iam-parent</artifactId>
-    <version>0.4.0.rc2-SNAPSHOT</version>
+    <version>0.4.0</version>
   </parent>
 
   <artifactId>iam-test-protected-resource</artifactId>
diff --git a/pom.xml b/pom.xml
index 7bfb8a1fa..dc1f359a8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -11,7 +11,7 @@
 
   <groupId>it.infn.mw</groupId>
   <artifactId>iam-parent</artifactId>
-  <version>0.4.0.rc2-SNAPSHOT</version>
+  <version>0.4.0</version>
   <packaging>pom</packaging>
   <name>IAM Parent POM</name>