diff --git a/CHANGELOG.md b/CHANGELOG.md
index 24829f5..52ea208 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -12,6 +12,35 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Removed
 ### Added
 
+## [6.0.0] - 2025-10-21
+
+### Changed
+
+- Updated to Baselibs 9.0.0
+  - FMS 2025.04
+    - NOTE 1: FMS is now built in mixed-precision mode. As such, we move the major number since linking to FMS is now different enough we want to note this
+    - NOTE 2: We now do a patch on FMS for (preliminary) LLVM Flang testing. Once LLVM Flang is fully supported, this patch will be removed
+  - GFE v1.21.0
+    - pFUnit v4.14.0
+    - This is mainly for LLVM Flang support
+- Move to GEOSpyD 25.3.1 Python 3.13
+
+## [5.16.0] - 2025-10-21
+
+### Changed
+
+- Update to Baselibs 8.20.0
+  - GFE v1.20.0
+    - gFTL v1.16.0
+    - gFTL-shared v1.11.0
+    - fArgParse v1.10.0
+    - pFUnit v4.13.0
+    - yaFyaml v1.6.0
+    - pFlogger v1.17.0
+  - NCO 5.3.5
+  - This is mainly for ifx 2025.2 support
+  - Requires CMake 3.24
+
 ## [5.15.0] - 2025-10-02
 
 ### Added
diff --git a/g5_modules b/g5_modules
index c00228c..1fb842e 100755
--- a/g5_modules
+++ b/g5_modules
@@ -121,9 +121,9 @@ set useldlibs = 0
 #========#
 if ( $site == NCCS ) then
 
-   set basedir = /discover/swdev/gmao_SIteam/Baselibs/ESMA-Baselibs-8.19.0/x86_64-pc-linux-gnu/ifort_2021.13.0-intelmpi_2021.13.0
+   set basedir = /discover/swdev/gmao_SIteam/Baselibs/ESMA-Baselibs-9.0.0/x86_64-pc-linux-gnu/ifort_2021.13.0-intelmpi_2021.13.0
 
-   set mod1 = python/GEOSpyD/24.11.3-0/3.12
+   set mod1 = python/GEOSpyD/25.3.1-0/3.13
    set mod2 = GEOSenv
 
    set mod3 = comp/gcc/12.3.0
@@ -145,9 +145,9 @@ if ( $site == NCCS ) then
 #=======#
 else if ( $site == NAS ) then
 
-   set basedir = /nobackup/gmao_SIteam/Baselibs/ESMA-Baselibs-8.19.0/x86_64-pc-linux-gnu/ifort_2021.13.0-mpt_2.30
+   set basedir = /nobackup/gmao_SIteam/Baselibs/ESMA-Baselibs-9.0.0/x86_64-pc-linux-gnu/ifort_2021.13.0-mpt_2.30
 
-   set mod1 = python/GEOSpyD/24.11.3-0/3.12
+   set mod1 = python/GEOSpyD/25.3.1-0/3.13
    set mod2 = GEOSenv
 
    set mod3 = comp-gcc/12.3.0-TOSS4
@@ -170,9 +170,9 @@ else if ( $site == NAS ) then
 #=================#
 else if ( $site == GMAO.desktop ) then
 
-   set basedir = /ford1/share/gmao_SIteam/Baselibs/ESMA-Baselibs-8.19.0/x86_64-pc-linux-gnu/ifort_2021.13.0-intelmpi_2021.13
+   set basedir = /ford1/share/gmao_SIteam/Baselibs/ESMA-Baselibs-9.0.0/x86_64-pc-linux-gnu/ifort_2021.13.0-intelmpi_2021.13
 
-   set mod1 = other/python/GEOSpyD/24.11.3-0/3.12
+   set mod1 = other/python/GEOSpyD/25.3.1-0/3.13
    set mod2 = GEOSenv
 
    set mod3 = comp/gcc/12.1.0