diff --git a/Doxyfile b/Doxyfile
index df9e333..f33c918 100644
--- a/Doxyfile
+++ b/Doxyfile
@@ -31,7 +31,7 @@ PROJECT_NAME = "MapMap"
 # This could be handy for archiving the generated documentation or
 # if some version control system is used.
 
-PROJECT_NUMBER = "0.3.2"
+PROJECT_NUMBER = "0.4.0"
 
 # The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute)
 # base path where the generated documentation will be put.
diff --git a/MM.cpp b/MM.cpp
index a67ece6..a195b81 100644
--- a/MM.cpp
+++ b/MM.cpp
@@ -22,7 +22,7 @@
 MM_BEGIN_NAMESPACE
 
 const QString MM::APPLICATION_NAME = "MapMap";
-const QString MM::VERSION = "0.3.2";
+const QString MM::VERSION = "0.4.0";
 const QString MM::COPYRIGHT_OWNERS = "Sofian Audry, Alexandre Quessy, Dame Diongue, Mike Latona, Vasilis Liaskovitis";
 const QString MM::ORGANIZATION_NAME = "MapMap";
 const QString MM::ORGANIZATION_DOMAIN = "mapmap.info";
diff --git a/NEWS b/NEWS
index 3cba2f3..26c5c01 100644
--- a/NEWS
+++ b/NEWS
@@ -1,10 +1,10 @@
 Release notes for MapMap
 ========================
 
-2015-??-?? - MapMap 0.3.2
+2016-04-19 - MapMap 0.4.0
 -------------------------
-* Added zoom toolbar
-* Added console window
+* Add zoom toolbar
+* Add console window
 * Fix #179: Paints and mappings renamings are now saved in file
 * Fix #162: Zooming in the destination canvas changes the size of controls in output window.
 * Fix #154: Problem with some video files: shape is size of single point
@@ -14,13 +14,13 @@ Release notes for MapMap
 * Fix #152: The software frozen when we load a project and the video files are not found
 * Abled to locate the video files if is not found when load a project
 * Fix #149: Deleting a mapping actually deletes a paint when the paint tab is chosen
-* Improved Test signal
+* Improve Test signal
 * Enhancement #117: Ellipse conical projection
 * Performance improvements
 * OSC general bug fixes
 * OSC support on OSX
 * Done #174: Be able to rename a Paint
-* DOne #72: Be able to name paints and mappings - for OSC controls
+* Done #72: Be able to name paints and mappings - for OSC controls
 * Center the test signal #97 (must use all the space available)
 * Fix #159: Program just freezes when importing corrupted video file
 * Done #145: The user doesn't need to see the undo stack
@@ -30,6 +30,24 @@ Release notes for MapMap
 * Done #147: Be able to delete a mapping with the delete key #147 (tested on Ubuntu)
 * Done #184: Make sure names support UTF-8 characters
 * Done #201 UX Design document: implement main toolbar improvements
+* Add solo/lock/mute/delete/duplicate mapping icons
+* Hide cursor when canvas controls are not shown
+* Can undo or redo Add/Remove paint
+* Implement #240 Allow easy switch between destination+source, destination-only and source-only views
+* Automatically move output screen to secondary screen
+* Fix bug: ESC key would not work properly to exit full screen.
+* Remove implicit shortcuts for menus (they were conflicting with other ALT+ based shortcuts).
+* Fix: It should be possible to have an output window when using a single screen (closes #209
+* Add LICENSE
+* Can reorder mapping by drag & drop
+* Fix: Flickering video images when loading from the commandline (closes #218).
+* Introduction of namespace
+* Add OSC support for play, pause, and rewind.
+* Fix: On Ubuntu 15.10 : window geometry not preserved after quit (closes #227).
+* Add option on the commandline to force language.
+* Fix error in mapmap.pro related to translations.
+* Fix blocking bug on OSX: program was freezing when move was loaded
+* Implemented new feature: holding the shift key while moving a vertex temporarily inverts stick
 
 2015-10-30 - MapMap 0.3.1
 -------------------------
diff --git a/mapmap.pro b/mapmap.pro
index de6ac9c..679f937 100644
--- a/mapmap.pro
+++ b/mapmap.pro
@@ -1,6 +1,7 @@
 CONFIG  += qt debug c++11
 TEMPLATE = app
-VERSION = 0.4
+# Always use major.minor.micro version number format
+VERSION = 0.4.0
 TARGET = mapmap
 QT += gui opengl xml core
 greaterThan(QT_MAJOR_VERSION, 4): QT += widgets core