diff --git a/HDF5/trilinos/12/variants b/HDF5/trilinos/12/variants
deleted file mode 100644
index 83b689f..0000000
--- a/HDF5/trilinos/12/variants
+++ /dev/null
@@ -1,20 +0,0 @@
-trilinos/12.2.1		unstable	gcc/4.8.2 openmpi/1.6.5 hdf5/1.8.12 b:cmake/3.6.3 b:OpenBLAS/0.2.9 b:parmetis/4.0.3 
-
-trilinos/12.8.1		stable		gcc/{4.8.5,4.9.4,5.4.0,6.2.0} openmpi/1.10.4 b:cmake/3.6.3 b:OpenBLAS/0.2.19 b:parmetis/4.0.3 
-trilinos/12.10.1	stable		gcc/{4.8.5,4.9.4,5.4.0,6.2.0} openmpi/1.10.4 b:cmake/3.6.3 b:OpenBLAS/0.2.19 b:parmetis/4.0.3 
-
-trilinos/12.10.1-1	stable		gcc/{5.4.0,6.2.0} openmpi/1.10.4 hdf5/1.8.18 b:cmake/3.6.3 b:OpenBLAS/0.2.19 b:parmetis/4.0.3 
-trilinos/12.10.1-2	stable		gcc/5.4.0 openmpi/1.10.4 hdf5/1.8.18 b:cmake/3.6.3 b:OpenBLAS/0.2.19 b:parmetis/4.0.3 
-
-
-trilinos/12.12.1	stable		gcc/7.3.0 openmpi/1.10.7 hdf5/1.10.1 b:cmake/3.6.3 b:OpenBLAS/0.2.20 b:parmetis/4.0.3 
-trilinos/12.12.1	stable		gcc/7.3.0 openmpi/2.1.2  hdf5/1.10.1 b:cmake/3.6.3 b:OpenBLAS/0.2.20 b:parmetis/4.0.3 
-trilinos/12.12.1	stable		gcc/7.3.0 openmpi/3.0.0  hdf5/1.10.1 b:cmake/3.6.3 b:OpenBLAS/0.2.20 b:parmetis/4.0.3 
-trilinos/12.12.1	stable		gcc/7.3.0 openmpi/3.1.2  hdf5/1.10.3 b:cmake/3.9.6 b:OpenBLAS/0.2.20 b:parmetis/4.0.3 
-trilinos/12.12.1	stable		gcc/7.3.0 openmpi/3.1.3  hdf5/1.10.4 b:cmake/3.9.6 b:OpenBLAS/0.2.20 b:parmetis/4.0.3 
-trilinos/12.12.1	stable		gcc/7.4.0 openmpi/3.1.4  hdf5/1.10.5 b:cmake/3.10.3 b:OpenBLAS/0.3.7 b:parmetis/4.0.3 
-trilinos/12.12.1	stable		gcc/7.3.0 mpich/3.3  hdf5/1.10.4 b:cmake/3.9.6 b:OpenBLAS/0.2.20 b:parmetis/4.0.3 
-
-trilinos/12.12.1	stable		intel/17.4 openmpi/1.10.7 hdf5/1.10.1 b:cmake/3.6.3 b:OpenBLAS/0.2.20 b:parmetis/4.0.3 
-trilinos/12.12.1	stable		intel/17.4 openmpi/2.1.2  hdf5/1.10.1 b:cmake/3.6.3 b:OpenBLAS/0.2.20 b:parmetis/4.0.3 
-trilinos/12.12.1	stable		intel/17.4 openmpi/3.0.0  hdf5/1.10.1 b:cmake/3.6.3 b:OpenBLAS/0.2.20 b:parmetis/4.0.3 
diff --git a/HDF5/trilinos/build b/HDF5/trilinos/build
index 3047df6..162f654 100755
--- a/HDF5/trilinos/build
+++ b/HDF5/trilinos/build
@@ -2,7 +2,7 @@
 
 pbuild::set_download_url \
 	"https://github.com/$P/$P/tarball/$P-release-${V//./-}" \
-	"$P-$V.tar.gz"
+	"$P-${V_PKG}.tar.gz"
 
 pbuild::set_sha256sum \
 	"trilinos-12.12.1.tar.gz:c8f2029fa36230b9f384c56139aaa33111227bcf653e73f7daf3c9efdecc1d2d"
diff --git a/HDF5/trilinos/12/variants.Darwin b/HDF5/trilinos/files/variants.Darwin
similarity index 100%
rename from HDF5/trilinos/12/variants.Darwin
rename to HDF5/trilinos/files/variants.Darwin
diff --git a/HDF5/trilinos/files/variants.merlin6 b/HDF5/trilinos/files/variants.merlin6
new file mode 100644
index 0000000..aa8ebf1
--- /dev/null
+++ b/HDF5/trilinos/files/variants.merlin6
@@ -0,0 +1 @@
+trilinos/12.18.1_slurm	unstable	gcc/{7.5.0,8.4.0,9.3.0} openmpi/3.1.6_slurm  hdf5/1.10.6_slurm b:cmake/3.15.5 b:OpenBLAS/0.3.10 b:parmetis/4.0.3_slurm
diff --git a/HDF5/trilinos/files/variants.rhel6 b/HDF5/trilinos/files/variants.rhel6
new file mode 100644
index 0000000..00b8695
--- /dev/null
+++ b/HDF5/trilinos/files/variants.rhel6
@@ -0,0 +1,22 @@
+#trilinos/11.10.2	deprecated	b:cmake/2.8.12.2 gcc/{4.7.4,4.8.3,4.8.4,9.2.0} openmpi/{1.6.5,1.8.2,1.8.4} OpenBLAS/0.2.9 parmetis/3.2.0 
+#trilinos/11.12.1	deprecated	b:cmake/2.8.12.2 gcc/{4.7.4,4.8.3,4.8.4,9.2.0} openmpi/{1.6.5,1.8.2,1.8.4} OpenBLAS/0.2.9 parmetis/3.2.0 
+#trilinos/11.14.1	deprecated	b:cmake/3.1.3 gcc/{4.7.4,4.8.3,4.8.4,9.2.0} openmpi/{1.6.5,1.8.2,1.8.4} OpenBLAS/0.2.9 parmetis/3.2.0 
+#trilinos/11.14.3	deprecated	b:cmake/3.4.1 gcc/4.8.5 openmpi/1.10.2 b:OpenBLAS/0.2.9 b:parmetis/3.2.0 
+#trilinos/11.14.3	deprecated	b:cmake/3.4.1 gcc/6.2.0 openmpi/{1.10.2,1.10.4,2.0.1} b:OpenBLAS/0.2.9 b:parmetis/3.2.0 
+
+trilinos/12.2.1		deprecated	gcc/4.8.2 openmpi/1.6.5 hdf5/1.8.12 b:cmake/3.6.3 b:OpenBLAS/0.2.9 b:parmetis/4.0.3 
+
+trilinos/12.8.1		stable		gcc/{4.8.5,4.9.4,5.4.0,6.2.0} openmpi/1.10.4 b:cmake/3.6.3 b:OpenBLAS/0.2.19 b:parmetis/4.0.3 
+trilinos/12.10.1	stable		gcc/{4.8.5,4.9.4,5.4.0,6.2.0} openmpi/1.10.4 b:cmake/3.6.3 b:OpenBLAS/0.2.19 b:parmetis/4.0.3 
+
+trilinos/12.10.1-1	stable		gcc/{5.4.0,6.2.0} openmpi/1.10.4 hdf5/1.8.18 b:cmake/3.6.3 b:OpenBLAS/0.2.19 b:parmetis/4.0.3 
+trilinos/12.10.1-2	stable		gcc/5.4.0 openmpi/1.10.4 hdf5/1.8.18 b:cmake/3.6.3 b:OpenBLAS/0.2.19 b:parmetis/4.0.3 
+
+trilinos/12.12.1	stable		gcc/7.3.0 openmpi/{1.10.7,2.1.2,3.0.0,3.1.2,3.1.3} hdf5/1.10.1 b:cmake/3.6.3 b:OpenBLAS/0.2.20 b:parmetis/4.0.3 
+
+trilinos/12.12.1	stable		gcc/7.4.0 openmpi/3.1.4  hdf5/1.10.5 b:cmake/3.10.3 b:OpenBLAS/0.3.7 b:parmetis/4.0.3 
+trilinos/12.12.1	stable		gcc/7.3.0 mpich/3.3  hdf5/1.10.4 b:cmake/3.9.6 b:OpenBLAS/0.2.20 b:parmetis/4.0.3 
+
+trilinos/12.12.1	stable		intel/17.4 openmpi/{1.10.7,2.1.2,3.0.0} hdf5/1.10.1 b:cmake/3.6.3 b:OpenBLAS/0.2.20 b:parmetis/4.0.3 
+
+trilinos/12.18.1	unstable	gcc/{7.5.0,8.4.0,9.3.0,10.1.0} openmpi/3.1.6  hdf5/1.10.6 b:cmake/3.15.5 b:OpenBLAS/0.3.10 b:parmetis/4.0.3