diff --git a/Libraries/gmp/5/variants b/Libraries/gmp/5/variants
index a951566..02b5e29 100644
--- a/Libraries/gmp/5/variants
+++ b/Libraries/gmp/5/variants
@@ -1 +1 @@
-5.1.1	stable	
+gmp/5.1.1	stable	
diff --git a/Libraries/gmp/6/variants b/Libraries/gmp/6/variants
index a18f6eb..c23f150 100644
--- a/Libraries/gmp/6/variants
+++ b/Libraries/gmp/6/variants
@@ -1,2 +1,3 @@
-6.0.0	stable	
-6.1.0	stable	
+gmp/6.0.0	stable	
+gmp/6.1.0	stable	
+gmp/6.1.1	stable	
diff --git a/MPI/hdf5/build b/MPI/hdf5/build
index e44dbbb..9bcf96a 100755
--- a/MPI/hdf5/build
+++ b/MPI/hdf5/build
@@ -8,15 +8,18 @@ pbuild::configure() {
 	FC=$MPIFC
 	FORTRAN=$MPIFORTRAN
 
+	local conf=''
+	conf+=' --enable-shared'
+	conf+=' --enable-parallel'
+	conf+=' --enable-cxx'
+	conf+=' --enable-fortran'
+	conf+=' --enable-unsupported'
+	#conf+=' --enable-threadsafe'
+	conf+=' --with-pic'
+
 	"${MODULE_SRCDIR}"/configure \
 		--prefix="${PREFIX}" \
-		--enable-shared \
-		--enable-parallel \
-		--enable-cxx \
-		--enable-fortran \
-		--enable-unsupported \
-		--enable-threadsafe \
-		--with-pic \
+		${conf} \
 		|| exit 1
 }
 
diff --git a/Programming/gcc/5/variants b/Programming/gcc/5/variants
index e71b999..5600a58 100644
--- a/Programming/gcc/5/variants
+++ b/Programming/gcc/5/variants
@@ -1,4 +1,5 @@
 gcc/5.1.0	deprecated	b:gmp/5.1.1 b:mpfr/3.1.2 b:mpc/1.0.2
 gcc/5.2.0	deprecated	b:gmp/6.0.0 b:mpfr/3.1.3 b:mpc/1.0.3
 gcc/5.3.0	stable		b:gmp/6.0.0 b:mpfr/3.1.3 b:mpc/1.0.3
+gcc/5.4.0	unstable	b:gmp/6.1.0 b:mpfr/3.1.4 b:mpc/1.0.3
 
diff --git a/Programming/gcc/build b/Programming/gcc/build
index 03cb483..1160fbc 100755
--- a/Programming/gcc/build
+++ b/Programming/gcc/build
@@ -16,6 +16,7 @@ pbuild::configure() {
 		--with-mpc="${MPC_PREFIX}" \
 		--enable-lto \
 		--disable-multilib \
+		--with-build-config=bootstrap-debug \
 		--with-pkgversion="PSI Environment Module" \
 		--with-build-config=bootstrap-debug \
 		|| exit 1
diff --git a/bin/manage_variants b/bin/manage_variants
index 200a799..fe8b725 100755
--- a/bin/manage_variants
+++ b/bin/manage_variants
@@ -6,7 +6,7 @@ declare variants=$2
 declare -r OS=$(uname -s)
 
 # File format example
-# 1.10.2	unstable	gcc/4.8.5
+# openmpi/1.10.2	unstable	gcc/4.8.5
 declare -a toks=()
 declare version=''
 declare release=''
@@ -22,7 +22,7 @@ while read -a toks; do
 
 	"${buildblock}"  "${module#*/}" --release=${release} "${dependencies[@]/#/--with=}"
 	if [[ $? != 0 ]]; then
-		echo "Failed building:  ${version} --release=${release} ${dependencies[@]/#/--with=}" 1>&2
+		echo "Failed building:  ${module} --release=${release} ${dependencies[@]/#/--with=}" 1>&2
 		exit 42
 	fi
 done < "${variants}"