diff --git a/var/spack/repos/builtin/packages/cbench/package.py b/var/spack/repos/builtin/packages/cbench/package.py
new file mode 100644
index 0000000000..4ce2cd5394
--- /dev/null
+++ b/var/spack/repos/builtin/packages/cbench/package.py
@@ -0,0 +1,92 @@
+##############################################################################
+# 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 LICENSE file 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 *
+
+
+class Cbench(MakefilePackage):
+    """Cbench is intended as a relatively straightforward toolbox of tests,
+    benchmarks, applications, utilities, and framework to hold them together
+    with the goal to facilitate scalable testing, benchmarking, and analysis
+    of a Linux parallel compute cluster."""
+
+    homepage = "https://sourceforge.net/projects/cbench/"
+    url      = "https://sourceforge.net/projects/cbench/files/cbench/1.3.0/cbench_release_1.3.0.tar.gz/download"
+    list_url = "https://sourceforge.net/projects/cbench/files/cbench/"
+    list_depth = 1
+
+    version('1.3.0', '2fb112876fdc96165d14e019b4a26f2e')
+
+    depends_on('mpi')
+    depends_on('blas')
+    depends_on('lapack')
+    depends_on('fftw')
+
+    # The following compilers are not supported by Cbench:
+    conflicts('%cce')
+    conflicts('%clang')
+    conflicts('%nag')
+    conflicts('%xl')
+    conflicts('%xl_r')
+
+    def edit(self, spec, prefix):
+        # The location of the Cbench source tree
+        env['CBENCHOME'] = self.stage.source_path
+
+        # The location that will contain all of your tests and their results
+        env['CBENCHTEST'] = prefix
+
+        # The location of the system MPI tree
+        env['MPIHOME'] = spec['mpi'].prefix
+
+        # Pick the compiler collection/chain you want to compile with.
+        # Examples include: intel, gcc, pgi.
+        env['COMPILERCOLLECTION'] = self.compiler.name
+
+        # Linking flags for BLAS/LAPACK and FFTW
+        env['BLASLIB']   = spec['blas'].libs.ld_flags
+        env['LAPACKLIB'] = spec['lapack'].libs.ld_flags
+        env['FFTWLIB']   = spec['fftw'].libs.ld_flags
+
+        # The number of make jobs (commands) to run simultaneously
+        env['JOBS'] = str(make_jobs)
+
+    @run_before('build')
+    @on_package_attributes(run_tests=True)
+    def test_blas_linkage(self):
+        """Quick test to ensure that BLAS linkage is working correctly."""
+
+        make('-C', 'opensource/maketests', 'clean')
+        make('-C', 'opensource/maketests', 'dummy_blas')
+        make('-C', 'opensource/maketests', 'linkstatus')
+
+    def install(self, spec, prefix):
+        # Install binaries in $CBENCHOME/bin
+        make('install')
+
+        # This creates a testing tree (if one doesn't already exist) and
+        # copies the binaries from `$CBENCHOME/bin` to `$CBENCHTEST/bin`.
+        # This allows you to use the testing tree independently of the
+        # source tree in the future.
+        make('installtests')