diff --git a/NEWS b/NEWS
index 2ebd54e782420a44f0cf3121ce4a15f9688a4cc4..e7ca7fb3fd6974f6baf069035b3b5f9a75f7b2e5 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,21 @@
+New in 2.04:
+
+* GCC 8 and 9 support.
+* Gnulib integration overhaul.
+* RISC-V support.
+* Xen PVH support.
+* Native UEFI secure boot support.
+* UEFI TPM driver.
+* New IEEE 1275 obdisk driver.
+* Btrfs RAID 5 and RIAD 6 support.
+* PARTUUID support.
+* VLAN support.
+* Native DHCP support.
+* Many ARM and ARM64 fixes.
+* Many SPARC fixes.
+* Many IEEE 1275 fixes.
+* ...and tons of other fixes and cleanups...
+
 New in 2.02:
 
 * New/improved filesystem and disk support:
diff --git a/configure.ac b/configure.ac
index 08b518fcc92c2799876f8353df0020cbc0735a3e..7656f2434e560ce964763a7b7cbaffd311de0e45 100644
--- a/configure.ac
+++ b/configure.ac
@@ -31,7 +31,7 @@ dnl (such as BUILD_CC, BUILD_CFLAGS, etc.) for the build type and variables
 dnl with the prefix "TARGET_" (such as TARGET_CC, TARGET_CFLAGS, etc.) are
 dnl used for the target type. See INSTALL for full list of variables.
 
-AC_INIT([GRUB],[2.04~rc1],[bug-grub@gnu.org])
+AC_INIT([GRUB],[2.04],[bug-grub@gnu.org])
 
 AC_CONFIG_AUX_DIR([build-aux])