diff --git a/packages/cldconfig/package.py b/packages/cldconfig/package.py
new file mode 100644
index 00000000..4b98bfb4
--- /dev/null
+++ b/packages/cldconfig/package.py
@@ -0,0 +1,39 @@
+# Copyright 2013-2020 Lawrence Livermore National Security, LLC and other
+# Spack Project Developers. See the top-level COPYRIGHT file for details.
+#
+# SPDX-License-Identifier: (Apache-2.0 OR MIT)
+
+from spack import *
+
+
+class Cldconfig(CMakePackage):
+    """Configuration files for the CLD detector concept"""
+
+    homepage = "https://github.com/key4hep/CLDConfig"
+    git = "https://github.com/key4hep/CLDConfig"
+
+    maintainers = ["jmcarcell"]
+
+    version("main", branch="main")
+    # Old tag to make sure there is at least one, can be removed when
+    # there is another
+    version("v02-04-01", tag="v02-04-01")
+
+    depends_on("k4geo", type="test")
+    depends_on("dd4hep", type="test")
+    depends_on("k4fwcore", type="test")
+    depends_on("k4marlinwrapper", type="test")
+    depends_on("marlintrkprocessors", type="test")
+    depends_on("conformaltracking", type="test")
+    depends_on("ddmarlinpandora", type="test")
+    depends_on("clicperformance", type="test")
+    depends_on("lcfiplus", type="test")
+    depends_on("marlinfastjet", type="test")
+
+    def cmake_args(self):
+        args = []
+        args.append("-DBUILD_TESTING=%s" % self.run_tests)
+        return args
+
+    def setup_run_environment(self, env):
+        env.prepend_path("CLDCONFIG", self.prefix)
diff --git a/packages/key4hep-stack/package.py b/packages/key4hep-stack/package.py
index 698e7713..7a7b52d4 100644
--- a/packages/key4hep-stack/package.py
+++ b/packages/key4hep-stack/package.py
@@ -51,6 +51,7 @@ class Key4hepStack(BundlePackage, Key4hepPackage):
     depends_on("babayaga")
     depends_on("bdsim")
     depends_on("bhlumi")
+    depends_on("cldconfig")
     depends_on("dd4hep")
     depends_on("delphes")
     depends_on("edm4hep")
diff --git a/scripts/fetch_nightly_versions.py b/scripts/fetch_nightly_versions.py
index 2c37b5e5..44716a00 100755
--- a/scripts/fetch_nightly_versions.py
+++ b/scripts/fetch_nightly_versions.py
@@ -105,6 +105,7 @@ def get_latest_commit(
         ("ced", "ilcsoft/ced"),
         ("cedviewer", "ilcsoft/cedviewer"),
         # ("cepcsw", "cepc/cepcsw"),
+        ("cldconfig", "key4hep/CLDConfig"),
         ("clicperformance", "ilcsoft/clicperformance"),
         ("conformaltracking", "ilcsoft/conformaltracking"),
         ("dd4hep", "aidasoft/dd4hep"),