diff --git a/var/spack/repos/builtin/packages/codar-cheetah/package.py b/var/spack/repos/builtin/packages/codar-cheetah/package.py
new file mode 100644
index 0000000000..393d6c7c21
--- /dev/null
+++ b/var/spack/repos/builtin/packages/codar-cheetah/package.py
@@ -0,0 +1,45 @@
+##############################################################################
+# Copyright (c) 2013-2016, Lawrence Livermore National Security, LLC.
+# Produced at the Lawrence Livermore National Laboratory.
+#
+# This file is part of Spack.
+# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved.
+# LLNL-CODE-647188
+#
+# For details, see https://github.com/llnl/spack
+# Please also see the NOTICE and LICENSE files for our notice and the LGPL.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License (as
+# published by the Free Software Foundation) version 2.1, February 1999.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and
+# conditions of the GNU Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+##############################################################################
+from spack import *
+from distutils.dir_util import copy_tree
+
+
+class CodarCheetah(Package):
+    """CODAR Cheetah:
+    The CODAR Experiment Harness for Exascale science applications.
+    """
+
+    homepage = "https://github.com/CODARcode/cheetah"
+    url = "https://github.com/CODARcode/cheetah/releases/tag/v0.1.tar.gz"
+
+    version('0.1', '6918021f74fa7a2f1de26c0bb31a63ef')
+    version('develop', git='https://github.com/CODARcode/cheetah.git',
+            branch='master')
+
+    depends_on('python@3:', type=('build', 'run'))
+    depends_on('savanna')
+
+    def install(self, spec, prefix):
+        copy_tree('.', prefix)