diff --git a/bld/namelist_files/namelist_defaults_cam.xml b/bld/namelist_files/namelist_defaults_cam.xml
index 7150acc89f..0a680a9949 100644
--- a/bld/namelist_files/namelist_defaults_cam.xml
+++ b/bld/namelist_files/namelist_defaults_cam.xml
@@ -362,6 +362,8 @@
 <analytic_ic_type phys="held_suarez"> held_suarez_1994 </analytic_ic_type>
 <analytic_ic_type phys="kessler"    > moist_baroclinic_wave_dcmip2016 </analytic_ic_type>
 <analytic_ic_type phys="tj2016"     > moist_baroclinic_wave_dcmip2016 </analytic_ic_type>
+<!-- MPAS Analytic ICs for aquaplanet (experimental) -->
+<analytic_ic_type dyn="mpas" aquaplanet="1"> us_standard_atmosphere </analytic_ic_type>
 
 <!-- Bulk aerosol physical properties (includes optics) -->
 
diff --git a/cime_config/config_component.xml b/cime_config/config_component.xml
index 78645415a8..965eef0ba9 100644
--- a/cime_config/config_component.xml
+++ b/cime_config/config_component.xml
@@ -179,6 +179,7 @@
       <!-- Aquaplanet -->
       <value compset="_DOCN%SOMAQP">-aquaplanet</value>
       <value compset="_DOCN%AQP"   >-aquaplanet</value>
+      <value compset="_DOCN%AQP" grid="a%mpasa[0-9]">-analytic_ic</value>
 
       <!-- PORT -->
       <value compset="%PORT">-offline_drv rad</value>