diff --git a/NEWS b/NEWS
index 0b83467a25f2f572332e16abe480fb758e28201d..7f916c59238503915e927377d887b93eef1f676c 100644
--- a/NEWS
+++ b/NEWS
@@ -6,8 +6,8 @@ Version 2.0.4
   - Fixed a few issues related to signal handling in both daemons and
     scripts
   - Fixed the example startup script provided
-  - Fixed insserv dependencies in the example startup script (patch
-    from Debian)
+  - Fixed insserv dependencies in the example startup script (patch from
+    Debian)
   - Fixed handling of drained nodes in the iallocator framework
   - Fixed handling of KERNEL_PATH parameter for xen-hvm (Debian bug
     #528618)
@@ -15,25 +15,27 @@ Version 2.0.4
   - Fixed job/opcode persistence on unclean master shutdown
   - Fixed handling of partial job processing after unclean master
     shutdown
+  - Fixed error reporting from LUs, previously all errors were converted
+    into execution errors
   - Fixed error reporting from burnin
   - Decreased significantly the memory usage of the job queue
   - Optimised slightly multi-job submission
   - Optimised slightly opcode loading
   - Backported the multi-job submit framework from the development
     branch; multi-instance start and stop should be faster
-  - Added script to clean archived jobs after 21 days; this will
-    reduce the size of the queue directory
+  - Added script to clean archived jobs after 21 days; this will reduce
+    the size of the queue directory
   - Added some extra checks in disk size tracking
   - Added an example ethers hook script
   - Added a cluster parameter that prevents Ganeti from modifying of
     /etc/hosts
   - Added more node information to RAPI responses
-  - Added a β€œgnt-job watch” command that allows following the ouput of
-    a job
+  - Added a β€œgnt-job watch” command that allows following the ouput of a
+    job
   - Added a bind-address option to ganeti-rapi
   - Added more checks to the configuration verify
-  - Enhanced the burnin script such that some operations can be
-    retried automatically
+  - Enhanced the burnin script such that some operations can be retried
+    automatically
   - Converted instance reinstall to multi-instance model
 
 Version 2.0.3
diff --git a/configure.ac b/configure.ac
index 6d3b906c1e6da552068b78fe9b05b01cd443ccb9..2e5b386762821f6f0e3d88f876fa1f8bcf9399e3 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,7 +1,7 @@
 # Configure script for Ganeti
 m4_define([gnt_version_major], [2])
 m4_define([gnt_version_minor], [0])
-m4_define([gnt_version_revision], [3])
+m4_define([gnt_version_revision], [4])
 m4_define([gnt_version_suffix], [])
 m4_define([gnt_version_full],
           m4_format([%d.%d.%d%s],