diff --git a/Compiler/openmpi/1.10/variants b/Compiler/openmpi/1.10/variants
index 8384899..e5cdf8c 100644
--- a/Compiler/openmpi/1.10/variants
+++ b/Compiler/openmpi/1.10/variants
@@ -1,10 +1,9 @@
-# comment
 1.10.0	Linux,Darwin	deprecated	gcc/4.8.4
 1.10.0	Linux,Darwin	deprecated	gcc/4.9.2
 1.10.0	Linux,Darwin	deprecated	gcc/4.9.3
-1.10.2	Linux,Darwin	unstable	gcc/4.8.5
-1.10.2	Linux,Darwin	unstable	gcc/4.9.3
-1.10.2	Linux,Darwin	unstable	gcc/5.2.0
-1.10.2	Linux,Darwin	unstable	gcc/5.3.0
+1.10.2	Linux,Darwin	stable		gcc/4.8.5
+1.10.2	Linux,Darwin	stable		gcc/4.9.3
+1.10.2	Linux,Darwin	deprecated	gcc/5.2.0
+1.10.2	Linux,Darwin	stable		gcc/5.3.0
 1.10.2	Linux,Darwin	unstable	gcc/6.1.0
 1.10.2	Linux		unstable	intel/15.3
diff --git a/Compiler/openmpi/1.6/variants b/Compiler/openmpi/1.6/variants
index cb898d0..a6b0c4c 100644
--- a/Compiler/openmpi/1.6/variants
+++ b/Compiler/openmpi/1.6/variants
@@ -1,9 +1,9 @@
 1.6.5	stable		Linux,Darwin	gcc/4.7.4
 1.6.5	stable		Linux,Darwin	gcc/4.8.3
 1.6.5	stable		Linux,Darwin	gcc/4.8.4
-1.6.5	unstable	Linux,Darwin	gcc/4.8.5
-1.6.5	stable		Linux,Darwin	gcc/4.9.2
-1.6.5	unstable	Linux,Darwin	gcc/4.9.3
+1.6.5	stable		Linux,Darwin	gcc/4.8.5
+1.6.5	deprecated	Linux,Darwin	gcc/4.9.2
+1.6.5	stable		Linux,Darwin	gcc/4.9.3
 1.6.5	stable		Linux		intel/15.2
 1.6.5	stable		Linux		intel/15.3
 
diff --git a/Compiler/openmpi/1.8/variants b/Compiler/openmpi/1.8/variants
index 744cacf..fbb7288 100644
--- a/Compiler/openmpi/1.8/variants
+++ b/Compiler/openmpi/1.8/variants
@@ -2,13 +2,16 @@
 1.8.2	Linux,Darwin	stable		gcc/4.7.4
 1.8.2	Linux,Darwin	stable		gcc/4.8.3
 1.8.2	Linux,Darwin	stable		gcc/4.8.4
-1.8.2	Linux,Darwin	stable		gcc/4.9.2
+1.8.2	Linux,Darwin	stable		gcc/4.8.5
+1.8.2	Linux,Darwin	deprecated	gcc/4.9.2
+1.8.2	Linux,Darwin	stable		gcc/4.9.3
 1.8.4	Linux,Darwin	stable		gcc/4.7.4
 1.8.4	Linux,Darwin	stable		gcc/4.8.3
 1.8.4	Linux,Darwin	stable		gcc/4.8.4
 1.8.4	Linux,Darwin	stable		gcc/4.9.2
 1.8.8	Linux,Darwin	deprecated	gcc/4.8.4
-1.8.8	Linux,Darwin	unstable	gcc/4.8.5
-1.8.8	Linux,Darwin	unstable	gcc/4.9.3
+1.8.8	Linux,Darwin	stable		gcc/4.8.5
+1.8.8	Linux,Darwin	stable		gcc/4.9.3
 1.8.8	Linux,Darwin	deprecated	gcc/5.2.0
-1.8.8	Linux,Darwin	unstable	gcc/5.3.0
+1.8.8	Linux,Darwin	stable		gcc/5.3.0
+1.8.8	Linux,Darwin	unstable	gcc/6.1.0
diff --git a/MPI/hdf5/1.8/variants b/MPI/hdf5/1.8/variants
index eeb6551..4445b4a 100644
--- a/MPI/hdf5/1.8/variants
+++ b/MPI/hdf5/1.8/variants
@@ -1,35 +1,34 @@
-hdf5/1.8.12	Linux,Darwin	stable		gcc/4.7.4 openmpi/1.6.5
-hdf5/1.8.12	Linux,Darwin	stable		gcc/4.7.4 openmpi/1.8.2
-hdf5/1.8.12	Linux,Darwin	stable		gcc/4.7.4 openmpi/1.8.4
-hdf5/1.8.12	Linux,Darwin	stable		gcc/4.8.3 openmpi/1.6.5
-hdf5/1.8.12	Linux,Darwin	stable		gcc/4.8.3 openmpi/1.8.2
-hdf5/1.8.12	Linux,Darwin	stable		gcc/4.8.3 openmpi/1.8.4
-hdf5/1.8.12	Linux,Darwin	stable		gcc/4.8.4 openmpi/1.6.5
-hdf5/1.8.12	Linux,Darwin	stable		gcc/4.8.4 openmpi/1.8.2
-hdf5/1.8.12	Linux,Darwin	stable		gcc/4.8.4 openmpi/1.8.4
-hdf5/1.8.12	Linux,Darwin	stable		gcc/4.9.2 openmpi/1.6.5
-hdf5/1.8.12	Linux,Darwin	stable		gcc/4.9.2 openmpi/1.8.2
-hdf5/1.8.12	Linux,Darwin	stable		gcc/4.9.2 openmpi/1.8.4
-hdf5/1.8.14	Linux,Darwin	stable		gcc/4.7.4 openmpi/1.6.5
-hdf5/1.8.14	Linux,Darwin	stable		gcc/4.7.4 openmpi/1.8.2
-hdf5/1.8.14	Linux,Darwin	stable		gcc/4.7.4 openmpi/1.8.4
-hdf5/1.8.14	Linux,Darwin	stable		gcc/4.8.3 openmpi/1.6.5
-hdf5/1.8.14	Linux,Darwin	stable		gcc/4.8.3 openmpi/1.8.2
-hdf5/1.8.14	Linux,Darwin	stable		gcc/4.8.3 openmpi/1.8.4
-hdf5/1.8.14	Linux,Darwin	stable		gcc/4.8.4 openmpi/1.6.5
-hdf5/1.8.14	Linux,Darwin	stable		gcc/4.8.4 openmpi/1.8.2
-hdf5/1.8.14	Linux,Darwin	stable		gcc/4.8.4 openmpi/1.8.4
-hdf5/1.8.14	Linux,Darwin	stable		gcc/4.8.4 openmpi/1.8.8
-hdf5/1.8.14	Linux,Darwin	stable		gcc/4.9.2 openmpi/1.6.5
-hdf5/1.8.14	Linux,Darwin	stable		gcc/4.9.2 openmpi/1.8.2
-hdf5/1.8.14	Linux,Darwin	stable		gcc/4.9.2 openmpi/1.8.4
-hdf5/1.8.15.1	Linux,Darwin	stable		gcc/5.2.0 openmpi/1.8.8
-hdf5/1.8.16	Linux,Darwin	unstable	gcc/4.8.5 openmpi/1.8.2
-hdf5/1.8.16	Linux,Darwin	unstable	gcc/4.8.5 openmpi/1.8.4
-hdf5/1.8.16	Linux,Darwin	unstable	gcc/4.8.5 openmpi/1.8.8
-hdf5/1.8.16	Linux,Darwin	unstable	gcc/4.9.3 openmpi/1.8.2
-hdf5/1.8.16	Linux,Darwin	unstable	gcc/4.9.3 openmpi/1.8.4
-hdf5/1.8.16	Linux,Darwin	unstable	gcc/4.9.3 openmpi/1.8.8
-hdf5/1.8.16	Linux,Darwin	unstable	gcc/5.3.0 openmpi/1.8.2
-hdf5/1.8.16	Linux,Darwin	unstable	gcc/5.3.0 openmpi/1.8.4
-hdf5/1.8.16	Linux,Darwin	unstable	gcc/5.3.0 openmpi/1.8.8
+1.8.12	Linux,Darwin	stable		gcc/4.7.4 openmpi/1.6.5
+1.8.12	Linux,Darwin	stable		gcc/4.7.4 openmpi/1.8.2
+1.8.12	Linux,Darwin	stable		gcc/4.7.4 openmpi/1.8.4
+1.8.12	Linux,Darwin	stable		gcc/4.8.3 openmpi/1.6.5
+1.8.12	Linux,Darwin	stable		gcc/4.8.3 openmpi/1.8.2
+1.8.12	Linux,Darwin	stable		gcc/4.8.3 openmpi/1.8.4
+1.8.12	Linux,Darwin	stable		gcc/4.8.4 openmpi/1.6.5
+1.8.12	Linux,Darwin	stable		gcc/4.8.4 openmpi/1.8.2
+1.8.12	Linux,Darwin	stable		gcc/4.8.4 openmpi/1.8.4
+1.8.12	Linux,Darwin	stable		gcc/4.9.2 openmpi/1.6.5
+1.8.12	Linux,Darwin	stable		gcc/4.9.2 openmpi/1.8.2
+1.8.12	Linux,Darwin	stable		gcc/4.9.2 openmpi/1.8.4
+1.8.14	Linux,Darwin	stable		gcc/4.7.4 openmpi/1.6.5
+1.8.14	Linux,Darwin	stable		gcc/4.7.4 openmpi/1.8.2
+1.8.14	Linux,Darwin	stable		gcc/4.7.4 openmpi/1.8.4
+1.8.14	Linux,Darwin	stable		gcc/4.8.3 openmpi/1.6.5
+1.8.14	Linux,Darwin	stable		gcc/4.8.3 openmpi/1.8.2
+1.8.14	Linux,Darwin	stable		gcc/4.8.3 openmpi/1.8.4
+1.8.14	Linux,Darwin	stable		gcc/4.8.4 openmpi/1.6.5
+1.8.14	Linux,Darwin	stable		gcc/4.8.4 openmpi/1.8.2
+1.8.14	Linux,Darwin	stable		gcc/4.8.4 openmpi/1.8.4
+1.8.14	Linux,Darwin	stable		gcc/4.8.4 openmpi/1.8.8
+1.8.14	Linux,Darwin	stable		gcc/4.9.2 openmpi/1.6.5
+1.8.14	Linux,Darwin	stable		gcc/4.9.2 openmpi/1.8.2
+1.8.14	Linux,Darwin	stable		gcc/4.9.2 openmpi/1.8.4
+1.8.15.1 Linux,Darwin	stable		gcc/5.2.0 openmpi/1.8.8
+1.8.16	Linux,Darwin	stable		gcc/4.8.5 openmpi/1.8.8
+1.8.16	Linux,Darwin	stable		gcc/4.8.5 openmpi/1.10.2
+1.8.16	Linux,Darwin	stable		gcc/4.9.3 openmpi/1.8.8
+1.8.16	Linux,Darwin	stable		gcc/4.9.3 openmpi/1.10.2
+1.8.16	Linux,Darwin	stable		gcc/5.3.0 openmpi/1.8.8
+1.8.16	Linux,Darwin	stable		gcc/5.3.0 openmpi/1.10.2
+1.8.16	Linux,Darwin	unstable	gcc/6.1.0 openmpi/1.8.8
+1.8.16	Linux,Darwin	unstable	gcc/6.1.0 openmpi/1.10.2
diff --git a/Programming/gcc/6/variants b/Programming/gcc/6/variants
index f27a29d..e17362d 100644
--- a/Programming/gcc/6/variants
+++ b/Programming/gcc/6/variants
@@ -1 +1 @@
-6.1.0	Linux,Darwin	stable		gmp/6.0.0 mpfr/3.1.3 mpc/1.0.3
+6.1.0	Linux,Darwin	unstable	gmp/6.1.0 mpfr/3.1.4 mpc/1.0.3