diff --git a/Dockerfile b/Dockerfile
index 30f7fe93..00e36753 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -45,6 +45,41 @@ RUN cd pnetcdf-1.12.3 && \
make -j 8 install && \
ldconfig
+ENV FC=gfortran
+
+###################################################
+## Build and install json-fortran
+###################################################
+RUN curl -LO https://github.com/jacobwilliams/json-fortran/archive/8.2.0.tar.gz \
+ && tar -zxvf 8.2.0.tar.gz \
+ && cd json-fortran-8.2.0 \
+ && mkdir build \
+ && cd build \
+ && cmake -D SKIP_DOC_GEN:BOOL=TRUE .. \
+ && make install -j 8
+
+###################################################
+## Build and install MUSICA
+###################################################
+
+RUN echo "asdf"
+
+RUN git clone https://github.com/NCAR/musica.git
+RUN mkdir /musica/build \
+ && cd /musica/build \
+ && export JSON_FORTRAN_HOME="/usr/local/jsonfortran-gnu-8.2.0" \
+ && cmake \
+ -D ENABLE_TESTS=OFF \
+ -D ENABLE_TUVX=OFF \
+ .. \
+ && make install -j 8
+
+###################################################
+## Add symlinks
+###################################################
+RUN ln -s /usr/local/jsonfortran-gnu-8.2.0/lib/libjsonfortran.a /usr/local/lib/libjsonfortran.a
+RUN ln -s /usr/local/musica-0.3.0/lib64/libmusica.a /usr/local/lib/libmusica.a
+
###################################################
## Build CAM-SIMA
###################################################
diff --git a/Externals.cfg b/Externals.cfg
index 2d8ae276..a77f6fa2 100644
--- a/Externals.cfg
+++ b/Externals.cfg
@@ -21,7 +21,7 @@ externals = Externals.cfg
required = True
[cmeps]
-tag = cmeps0.14.24
+tag = cmeps0.14.34
protocol = git
repo_url = https://github.com/ESCOMP/CMEPS.git
local_path = components/cmeps
diff --git a/cime_config/config_component.xml b/cime_config/config_component.xml
index 9a5831f3..0132fa72 100644
--- a/cime_config/config_component.xml
+++ b/cime_config/config_component.xml
@@ -301,6 +301,18 @@
User mods to apply to specific compset matches.
+
+ char
+
+ -lmusica -ljsonfortran
+ build_component_cam
+ env_build.xml
+
+ CAMSIMA linked libraries. The libraries are built by CAMSIMA's buildlib script and should be included
+ during linking of the model executable.
+
+
+
=========================================
CAM naming conventions