diff --git a/cime_config/buildnml b/cime_config/buildnml
index 3e0718538..ff2553be7 100755
--- a/cime_config/buildnml
+++ b/cime_config/buildnml
@@ -106,7 +106,8 @@ def _create_drv_namelists(case, infile, confdir, nmlgen, files):
     config["COMP_OCN"] = case.get_value("COMP_OCN")
     config["COMP_ROF"] = case.get_value("COMP_ROF")
     config["COMP_WAV"] = case.get_value("COMP_WAV")
-
+    config["CAMDEV"] = "True" if "CAM%DEV" in case.get_value("COMPSET") else "False"
+    
     if (
         (
             case.get_value("COMP_ROF") == "mosart"
diff --git a/cime_config/namelist_definition_drv.xml b/cime_config/namelist_definition_drv.xml
index 36c230342..3e4d6bf6b 100644
--- a/cime_config/namelist_definition_drv.xml
+++ b/cime_config/namelist_definition_drv.xml
@@ -954,7 +954,8 @@
       add a wind gustiness factor
     </desc>
     <values>
-      <value>.false.</value>
+      <value CAMDEV="True">.true.</value>
+      <value CAMDEV="False">.false.</value>
     </values>
   </entry>