diff --git a/Externals_CAM.cfg b/Externals_CAM.cfg
index 43c64dcc..d2fb49cf 100644
--- a/Externals_CAM.cfg
+++ b/Externals_CAM.cfg
@@ -1,8 +1,8 @@
 [ccpp-framework]
 local_path = ccpp_framework
 protocol = git
-repo_url = https://github.com/peverwhee/ccpp-framework
-tag = CPF_0.2.056
+repo_url = https://github.com/gold2718/ccpp-framework
+tag = f3cca0b4723545d7950ace9b612ce9b253fa8d7e
 required = True
 
 [mpas]
@@ -16,8 +16,8 @@ required = True
 [ncar-physics]
 local_path = src/physics/ncar_ccpp
 protocol = git
-repo_url = https://github.com/ESCOMP/atmospheric_physics
-tag = atmos_phys0_02_006
+repo_url = https://github.com/mattldawson/atmospheric_physics
+tag = develop-74-chem-species
 required = True
 
 [externals_description]
diff --git a/cime_config/cam_autogen.py b/cime_config/cam_autogen.py
index f6c9a69d..53b85922 100644
--- a/cime_config/cam_autogen.py
+++ b/cime_config/cam_autogen.py
@@ -615,6 +615,11 @@ def generate_physics_suites(build_cache, preproc_defs, host_name,
         ufiles_str = datatable_report(cap_output_file, request, ";")
         utility_files = ufiles_str.split(';')
         _update_genccpp_dir(utility_files, genccpp_dir)
+        request = DatatableReport("dependencies")
+        dep_str = datatable_report(cap_output_file, request, ";")
+        if len(dep_str) > 0:
+            dependency_files = dep_str.split(';')
+            _update_genccpp_dir(dependency_files, genccpp_dir)
         ##XXgoldyXX: ^ Temporary fix:
     # End if