diff --git a/var/spack/repos/builtin/packages/archer/package.py b/var/spack/repos/builtin/packages/archer/package.py
new file mode 100644
index 0000000000..dd4c27700f
--- /dev/null
+++ b/var/spack/repos/builtin/packages/archer/package.py
@@ -0,0 +1,57 @@
+##############################################################################
+# 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 Archer(Package):
+    """ARCHER, a data race detection tool for large OpenMP applications."""
+
+    homepage = "https://github.com/PRUNERS/ARCHER"
+
+    version('1.0.0b', git='https://github.com/PRUNERS/ARCHER.git',
+            commit='2cf7ead36358842871d5bd9c33d499f62bf8dd38')
+
+    depends_on('cmake', type='build')
+    depends_on('llvm+clang~gold')
+    depends_on('ninja', type='build')
+    depends_on('llvm-openmp-ompt')
+
+    def install(self, spec, prefix):
+
+        with working_dir('spack-build', create=True):
+            cmake_args = std_cmake_args[:]
+            cmake_args.extend([
+                '-G', 'Ninja',
+                '-DCMAKE_C_COMPILER=clang',
+                '-DCMAKE_CXX_COMPILER=clang++',
+                '-DOMP_PREFIX:PATH=%s' % spec['llvm-openmp-ompt'].prefix,
+                '-DLIBOMP_TSAN_SUPPORT=TRUE',
+            ])
+
+            cmake('..', *cmake_args)
+            ninja = Executable('ninja')
+            ninja()
+            ninja('install')
diff --git a/var/spack/repos/builtin/packages/llvm-openmp-ompt/package.py b/var/spack/repos/builtin/packages/llvm-openmp-ompt/package.py
new file mode 100644
index 0000000000..1dc1089d68
--- /dev/null
+++ b/var/spack/repos/builtin/packages/llvm-openmp-ompt/package.py
@@ -0,0 +1,60 @@
+##############################################################################
+# 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 LlvmOpenmpOmpt(Package):
+    """The OpenMP subproject provides an OpenMP runtime for use with the
+       OpenMP implementation in Clang. This branch includes experimental
+       changes for OMPT, the OpenMP Tools interface"""
+
+    homepage = "https://github.com/OpenMPToolsInterface/LLVM-openmp"
+
+    # align-to-tr-rebased branch
+    version('3.9.2b',
+            git='https://github.com/OpenMPToolsInterface/LLVM-openmp.git',
+            commit='982a08bcf3df9fb5afc04ac3bada47f19cc4e3d3') 
+
+    depends_on('cmake', type='build')
+    depends_on('llvm+clang~gold')
+    depends_on('ninja', type='build')
+
+    def install(self, spec, prefix):
+
+        with working_dir('spack-build', create=True):
+            cmake_args = std_cmake_args[:]
+            cmake_args.extend([
+                '-G', 'Ninja',
+                '-DCMAKE_C_COMPILER=clang',
+                '-DCMAKE_CXX_COMPILER=clang++',
+                '-DCMAKE_BUILD_TYPE=Release',
+                '-DLIBOMP_TSAN_SUPPORT=TRUE'
+            ])
+
+            cmake('..', *cmake_args)
+            ninja = Executable('ninja')
+            ninja()
+            ninja('install')
diff --git a/var/spack/repos/builtin/packages/llvm/package.py b/var/spack/repos/builtin/packages/llvm/package.py
index 029177cea2..1da14feb4f 100644
--- a/var/spack/repos/builtin/packages/llvm/package.py
+++ b/var/spack/repos/builtin/packages/llvm/package.py
@@ -77,6 +77,7 @@ class Llvm(Package):
 
     # Universal dependency
     depends_on('python@2.7:2.8')  # Seems not to support python 3.X.Y
+    depends_on('py-lit')
 
     # lldb dependencies
     depends_on('ncurses', when='+lldb')
diff --git a/var/spack/repos/builtin/packages/py-lit/package.py b/var/spack/repos/builtin/packages/py-lit/package.py
new file mode 100644
index 0000000000..238d1b1500
--- /dev/null
+++ b/var/spack/repos/builtin/packages/py-lit/package.py
@@ -0,0 +1,39 @@
+##############################################################################
+# 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 PyLit(PythonPackage):
+    """lit is a portable tool for executing LLVM and Clang style test suites,
+       summarizing their results, and providing indication of failures. lit is
+       designed to be a lightweight testing tool with as simple a user
+       interface as possible."""
+
+    homepage = "https://pypi.python.org/pypi/lit"
+    url      = "https://pypi.python.org/packages/5b/a0/dbed2c8dfb220eb9a5a893257223cd0ff791c0fbc34ce2f1a957fa4b6c6f/lit-0.5.0.tar.gz"
+
+    version('0.5.0',  '8144660cc692be8fb903395a5f06564d')
+
+    depends_on('py-setuptools', type='build')