diff --git a/.gitmodules b/.gitmodules
index 35a81a61e..b1f475b64 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,11 +1,9 @@
 [submodule "spack"]
   path = spack
-  ##url = https://github.com/spack/spack
-  ##branch = develop
-  #url = https://github.com/jcsda/spack
-  #branch = jcsda_emc_spack_stack
-  url = https://github.com/climbfuji/spack
-  branch = feature/detect_external_libiconv
+  #url = https://github.com/spack/spack
+  #branch = develop
+  url = https://github.com/jcsda/spack
+  branch = jcsda_emc_spack_stack
 [submodule "doc/CMakeModules"]
   path = doc/CMakeModules
   url = https://github.com/noaa-emc/cmakemodules
diff --git a/spack b/spack
index d5c705519..95718234e 160000
--- a/spack
+++ b/spack
@@ -1 +1 @@
-Subproject commit d5c70551996a8609beb1c40fef2ce5846d155451
+Subproject commit 95718234e20886b0507d337ef7e18dedf2aaecc7