diff --git a/NEWS b/NEWS
index 1f03ef09127..efacdb22d91 100644
--- a/NEWS
+++ b/NEWS
@@ -36,6 +36,36 @@ This file contains notable changes between releases for each release since
 Open MPI 1.0.  Because Open MPI maintains multiple release branches at any time,
 it is possible for items to appear more than once in the list.
 
+3.0.4 -- March, 2019
+--------------------
+
+- Fix compile error when configured with --enable-mpi-java and
+  --with-devel-headers.  Thanks to @g-raffy for reporting the issue.
+- Fix possible floating point rounding and division issues in OMPIO
+  which led to crashes and/or data corruption with very large data.
+  Thanks to Axel Huebl and René Widera for identifing the issue,
+  supplying and testing the fix (** also appeared: v3.0.4).
+- Use static_cast<> in mpi.h where appropriate.  Thanks to @shadow-fx
+  for identifying the issue.
+- Fix datatype issue with RMA accumulate.  Thanks to Jeff Hammond for
+  raising the issue.
+- Fix RMA accumulate of non-predefined datatypes with predefined
+  operators.  Thanks to Jeff Hammond for raising the issue.
+- Fix race condition when closing open file descriptors when launching
+  MPI processes.  Thanks to Jason Williams for identifying the issue and
+  supplying the fix.
+- Fix Valgrind warnings for some MPI_TYPE_CREATE_* functions.  Thanks
+  to Risto Toijala for identifying the issue and supplying the fix.
+- Fix MPI_TYPE_CREATE_F90_{REAL,COMPLEX} for r=38 and r=308.
+- Fix assembly issues with old versions of gcc (<6.0.0) that affected
+  the stability of shared memory communications (e.g., with the vader
+  BTL).
+- Fix the OFI MTL handling of MPI_ANY_SOURCE.
+- Fix noisy errors in the openib BTL with regards to
+  ibv_exp_query_device().  Thanks to Angel Beltre and others who
+  reported the issue.
+
+
 3.0.3 -- October, 2018
 ----------------------
 
diff --git a/README b/README
index 209ba84d345..d9f4ce33e6f 100644
--- a/README
+++ b/README
@@ -64,7 +64,7 @@ Much, much more information is also available in the Open MPI FAQ:
 ===========================================================================
 
 The following abbreviated list of release notes applies to this code
-base as of this writing (March 2017):
+base as of this writing (March 2019):
 
 General notes
 -------------
diff --git a/VERSION b/VERSION
index f01910d808e..c835575c4ab 100644
--- a/VERSION
+++ b/VERSION
@@ -24,7 +24,7 @@ release=4
 # requirement is that it must be entirely printable ASCII characters
 # and have no white space.
 
-greek=a1
+greek=rc1
 
 # If repo_rev is empty, then the repository version number will be
 # obtained during "make dist" via the "git describe --tags --always"
@@ -82,17 +82,17 @@ date="Unreleased developer copy"
 # Version numbers are described in the Libtool current:revision:age
 # format.
 
-libmpi_so_version=40:4:0
-libmpi_cxx_so_version=40:0:0
-libmpi_mpifh_so_version=41:3:1
-libmpi_usempi_tkr_so_version=40:1:0
-libmpi_usempi_ignore_tkr_so_version=40:1:0
-libmpi_usempif08_so_version=40:2:0
-libopen_rte_so_version=40:4:0
-libopen_pal_so_version=42:0:0
-libmpi_java_so_version=40:0:0
-liboshmem_so_version=41:2:1
-libompitrace_so_version=40:0:0
+libmpi_so_version=40:5:0
+libmpi_cxx_so_version=40:1:0
+libmpi_mpifh_so_version=41:4:1
+libmpi_usempi_tkr_so_version=40:2:0
+libmpi_usempi_ignore_tkr_so_version=40:3:0
+libmpi_usempif08_so_version=40:3:0
+libopen_rte_so_version=40:5:0
+libopen_pal_so_version=42:1:0
+libmpi_java_so_version=40:1:0
+liboshmem_so_version=41:3:1
+libompitrace_so_version=40:1:0
 
 # "Common" components install standalone libraries that are run-time
 # linked by one or more components.  So they need to be versioned as
@@ -100,13 +100,13 @@ libompitrace_so_version=40:0:0
 # components-don't-affect-the-build-system abstraction.
 
 # OMPI layer
-libmca_ompi_common_ompio_so_version=41:1:0
+libmca_ompi_common_ompio_so_version=41:2:0
 
 # ORTE layer
-libmca_orte_common_alps_so_version=40:0:0
+libmca_orte_common_alps_so_version=40:1:0
 
 # OPAL layer
-libmca_opal_common_cuda_so_version=40:0:0
-libmca_opal_common_sm_so_version=40:0:0
-libmca_opal_common_ugni_so_version=40:0:0
-libmca_opal_common_verbs_so_version=41:0:1
+libmca_opal_common_cuda_so_version=40:1:0
+libmca_opal_common_sm_so_version=40:1:0
+libmca_opal_common_ugni_so_version=40:1:0
+libmca_opal_common_verbs_so_version=41:1:1