diff --git a/var/spack/repos/builtin/packages/archer/package.py b/var/spack/repos/builtin/packages/archer/package.py
index 31a1d498daf1fcdeebf204fb49a198819797a34a..247743ed0db533ad9ed2c7917a0d5af1d9a04c01 100644
--- a/var/spack/repos/builtin/packages/archer/package.py
+++ b/var/spack/repos/builtin/packages/archer/package.py
@@ -30,12 +30,12 @@ class Archer(Package):
     """ARCHER, a data race detection tool for large OpenMP applications."""
 
     homepage = "https://github.com/PRUNERS/ARCHER"
+    url      = "https://github.com/PRUNERS/archer/archive/v1.0.0.tar.gz"
 
-    version('1.0.0b', git='https://github.com/PRUNERS/ARCHER.git',
-            commit='2cf7ead36358842871d5bd9c33d499f62bf8dd38')
+    version('1.0.0', '790bfaf00b9f57490eb609ecabfe954a')
 
     depends_on('cmake', type='build')
-    depends_on('llvm+clang~gold')
+    depends_on('llvm')
     depends_on('ninja', type='build')
     depends_on('llvm-openmp-ompt')
 
diff --git a/var/spack/repos/builtin/packages/llvm-openmp-ompt/package.py b/var/spack/repos/builtin/packages/llvm-openmp-ompt/package.py
index 8b83f216b60dedfd0bc69829b1386bacdfad149b..7cc42e0f2829c7244aac25df3a7bed4a6f480e86 100644
--- a/var/spack/repos/builtin/packages/llvm-openmp-ompt/package.py
+++ b/var/spack/repos/builtin/packages/llvm-openmp-ompt/package.py
@@ -33,13 +33,17 @@ class LlvmOpenmpOmpt(Package):
 
     homepage = "https://github.com/OpenMPToolsInterface/LLVM-openmp"
 
+    # tr4-stable branch
+    version('3.9.2b2',
+            git='https://github.com/OpenMPToolsInterface/LLVM-openmp.git',
+            commit='5cdca5dd3c0c336d42a335ca7cff622e270c9d47')
     # 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('llvm')
     depends_on('ninja', type='build')
 
     def install(self, spec, prefix):
diff --git a/var/spack/repos/builtin/packages/pruners-ninja/package.py b/var/spack/repos/builtin/packages/pruners-ninja/package.py
new file mode 100644
index 0000000000000000000000000000000000000000..effbd979c371a6e702165ed1e79f6eee27b365ed
--- /dev/null
+++ b/var/spack/repos/builtin/packages/pruners-ninja/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 PrunersNinja(AutotoolsPackage):
+    """NINJA: Noise Inject agent tool to expose subtle and unintended message
+       races."""
+    homepage = "https://github.com/PRUNERS/NINJA"
+    url      = "https://github.com/PRUNERS/NINJA/releases/download/v1.0.0/NINJA-1.0.0.tar.gz"
+
+    version("1.0.0", "fee53c4712ac521ebec3cd8692e5185a")
+
+    depends_on("mpi")
+    depends_on("autoconf", type='build')
+    depends_on("automake", type='build')
+    depends_on("libtool", type='build')
diff --git a/var/spack/repos/builtin/packages/rempi/package.py b/var/spack/repos/builtin/packages/rempi/package.py
new file mode 100644
index 0000000000000000000000000000000000000000..d93dbfa7227ea2a1e0468f4ab0af70f04c30e6ca
--- /dev/null
+++ b/var/spack/repos/builtin/packages/rempi/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 Rempi(AutotoolsPackage):
+    """ReMPI is a record-and-replay tool for MPI applications."""
+    homepage = "https://github.com/PRUNERS/ReMPI"
+    url      = "https://github.com/PRUNERS/ReMPI/releases/download/v1.0.0/ReMPI-1.0.0.tar.gz"
+
+    version("1.0.0", "32c780a6a74627b5796bea161d4c4733")
+
+    depends_on("mpi")
+    depends_on("zlib")
+    depends_on("autoconf", type='build')
+    depends_on("automake", type='build')
+    depends_on("libtool", type='build')