diff --git a/o/OpenMPI/OpenMPI-2.1.1-GCC-6.3.0-2.27.eb b/o/OpenMPI/OpenMPI-2.1.1-GCC-6.3.0-2.27.eb
new file mode 100644
index 00000000..6e998239
--- /dev/null
+++ b/o/OpenMPI/OpenMPI-2.1.1-GCC-6.3.0-2.27.eb
@@ -0,0 +1,47 @@
+easyblock = 'ConfigureMake'
+
+name = 'OpenMPI'
+version = '2.1.1'
+
+homepage = 'http://www.open-mpi.org/'
+description = """The Open MPI Project is an open source MPI-3.1 implementation."""
+
+toolchain = {'name': 'GCC', 'version': '6.3.0-2.27'}
+
+source_urls = ['http://www.open-mpi.org/software/ompi/v%(version_major_minor)s/downloads']
+sources = [SOURCELOWER_TAR_GZ]
+
+builddependencies = [
+   ('Java', '1.8.0_121', '', True)
+]
+
+dependencies = [
+   ('hwloc', '1.11.6')
+]
+
+# for PBS Pro 13
+preconfigopts = 'export LIBS="-ldl" && '
+
+configopts = '--enable-shared --enable-mpi-thread-multiple --with-verbs '
+configopts += '--enable-mpirun-prefix-by-default '  # suppress failure modes in relation to mpirun path
+configopts += '--with-hwloc=$EBROOTHWLOC '  # hwloc support
+#configopts += '--disable-dlopen '  # statically link component, don't do dynamic loading
+configopts += '--with-tm=/opt/pbs/default '  # Enable PBS
+configopts += '--enable-mpi-java ' # Java support RT#4090
+
+# needed for --with-verbs
+osdependencies = [('libibverbs-dev', 'libibverbs-devel')]
+
+libs = ["mpi_mpifh", "mpi", "ompitrace", "open-pal", "open-rte"]
+sanity_check_paths = {
+    'files': ["bin/%s" % binfile for binfile in ["ompi_info", "opal_wrapper", "orterun"]] +
+             ["lib/lib%s.%s" % (libfile, SHLIB_EXT) for libfile in libs] +
+             ["include/%s.h" % x for x in ["mpi-ext", "mpif-config", "mpif", "mpi", "mpi_portable_platform"]],
+    'dirs': [],
+}
+
+modextravars = {'OMPI_MCA_btl_openib_if_include': 'mlx4_0',
+                'OMPI_MCA_oob_tcp_if_include': '10.0.0.0/8',
+}
+
+moduleclass = 'mpi'
diff --git a/t/Trilinos/Trilinos-12.10.1-intel-2017a-Python-2.7.11-test.eb b/t/Trilinos/Trilinos-12.10.1-intel-2017a-Python-2.7.11-test.eb
index a00cd7ad..4bac768e 100644
--- a/t/Trilinos/Trilinos-12.10.1-intel-2017a-Python-2.7.11-test.eb
+++ b/t/Trilinos/Trilinos-12.10.1-intel-2017a-Python-2.7.11-test.eb
@@ -12,10 +12,10 @@ description = """The Trilinos Project is an effort to develop algorithms and ena
 toolchain = {'name': 'intel', 'version': '2017a'}
 toolchainopts = {'usempi': True, 'pic': True, 'strict': True}
 
-source_urls = ['https://github.com/trilinos/Trilinos/archive']
-sources = ['master.zip']
+source_urls = ['http://trilinos.csbsju.edu/download/files/']
+sources = ['%(namelower)s-%(version)s-Source.tar.gz']
 
-#patches = ['Trilinos-12.10.1-muelu.patch']
+patches = ['Trilinos-12.10.1-muelu.patch']
 
 builddependencies = [
     ('CMake', '3.5.2', '', True),