diff --git a/CHANGELOG.md b/CHANGELOG.md
index a070f995..cae44518 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,23 @@
 # Changelog
 
+## [10.12.4] - 2020-05-15
+
+### Zero-diff to previous release: YES
+
+### Restart Changes: NO
+
+Major changes are:
+1. Brings RRTMGP code up to date with recent Pincus Master changes as of 3 May 2020
+2. Add ability to run setup scripts in another's install directory
+3. Support for new surface parameter resource file for land
+4. Fixes issues with the scm_setup
+5. Update CircleCI to use Baselibs 6.0.12
+6. Use different ALLREDUCE algorithm for Intel MPI
+7. Change Intel MPI GATHERV algorithm so GEOSgcm does not lock up on skylakes at checkpoint
+8. Add a commented out setenv for the FOR_IGNORE_EXCEPTIONS in MPT
+9. Add option to symlink GEOSgcm.x in experiment directory
+10. FSEGMENT bug fix in gcm_forecast.setup
+
 ## [10.12.3] - 2020-04-21
 
 ### Zero-diff to previous release: YES
diff --git a/CMakeLists.txt b/CMakeLists.txt
index c6f7bd91..5d366f15 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -4,7 +4,7 @@ cmake_policy (SET CMP0054 NEW)
 
 project (
   GEOSgcm
-  VERSION 10.12.3
+  VERSION 10.12.4
   LANGUAGES Fortran CXX C)  # Note - CXX is required for ESMF
 
 if ("${PROJECT_SOURCE_DIR}" STREQUAL "${PROJECT_BINARY_DIR}")
diff --git a/Externals.cfg b/Externals.cfg
index 56e3051c..892cc820 100644
--- a/Externals.cfg
+++ b/Externals.cfg
@@ -54,7 +54,7 @@ protocol = git
 required = True
 repo_url = git@github.com:GEOS-ESM/GEOSgcm_GridComp.git
 local_path = ./src/Components/@GEOSgcm_GridComp
-tag = v1.8.3
+tag = v1.8.4
 protocol = git
 externals = Externals.cfg
 
@@ -62,7 +62,7 @@ externals = Externals.cfg
 required = True
 repo_url = git@github.com:GEOS-ESM/GEOSgcm_App.git
 local_path = ./src/Applications/@GEOSgcm_App
-tag = v1.3.2
+tag = v1.3.3
 protocol = git
 
 [UMD_Etc]
diff --git a/components.yaml b/components.yaml
index 38b545a5..af714539 100644
--- a/components.yaml
+++ b/components.yaml
@@ -49,7 +49,7 @@ FMS:
 GEOSgcm_GridComp:
   local: ./src/Components/@GEOSgcm_GridComp
   remote: ../GEOSgcm_GridComp.git
-  tag: v1.8.3
+  tag: v1.8.4
   develop: develop
 
 FVdycoreCubed_GridComp:
@@ -79,7 +79,7 @@ mom:
 GEOSgcm_App:
   local: ./src/Applications/@GEOSgcm_App
   remote: ../GEOSgcm_App.git
-  tag: v1.3.2
+  tag: v1.3.3
   develop: develop
 
 UMD_Etc: