diff --git a/Compiler/boost/1/variants b/Compiler/boost/1/variants
index 91baad0..90cfdc1 100644
--- a/Compiler/boost/1/variants
+++ b/Compiler/boost/1/variants
@@ -1,6 +1,8 @@
 boost/1.55.0         stable     gcc/4.7.4 b:Python/3.4.0 
 boost/1.55.0         stable     gcc/4.8.3 b:Python/3.4.0 
 boost/1.55.0         stable     gcc/4.8.4 b:Python/3.4.0 
+boost/1.55.0         stable     gcc/4.8.5 b:Python/2.7.11
 boost/1.55.0         stable     gcc/4.9.2 b:Python/3.4.0 
 boost/1.58.0         unstable   gcc/4.8.4 b:Python/3.4.0 
+boost/1.58.0         unstable   gcc/4.8.5 b:Python/2.7.11 
 boost/1.58.0         unstable   gcc/4.9.3 b:Python/2.7.11
diff --git a/Compiler/boost/build b/Compiler/boost/build
index 4421be6..6b1d47e 100755
--- a/Compiler/boost/build
+++ b/Compiler/boost/build
@@ -19,7 +19,7 @@ pbuild::build() {
 		--layout=system \
 		--without-mpi \
 		variant=release \
-		link=shared \
+		link=shared,static \
 		threading=multi \
 		stage
 }
@@ -32,7 +32,7 @@ pbuild::install() {
 		--layout=system \
 		--without-mpi \
 		variant=release \
-		link=shared \
+		link=shared,static \
 		threading=multi \
 		install
 }
diff --git a/HDF5/H5hut/1.99/variants b/HDF5/H5hut/1.99/variants
new file mode 100644
index 0000000..89a54ed
--- /dev/null
+++ b/HDF5/H5hut/1.99/variants
@@ -0,0 +1,25 @@
+H5hut/1.99.13        stable     gcc/4.7.4 openmpi/1.6.5 hdf5/1.8.12
+H5hut/1.99.13        stable     gcc/4.7.4 openmpi/1.6.5 hdf5/1.8.14
+H5hut/1.99.13        stable     gcc/4.7.4 openmpi/1.8.2 hdf5/1.8.12
+H5hut/1.99.13        stable     gcc/4.7.4 openmpi/1.8.2 hdf5/1.8.14
+H5hut/1.99.13        stable     gcc/4.7.4 openmpi/1.8.4 hdf5/1.8.12
+H5hut/1.99.13        stable     gcc/4.7.4 openmpi/1.8.4 hdf5/1.8.14
+H5hut/1.99.13        stable     gcc/4.8.3 openmpi/1.6.5 hdf5/1.8.12
+H5hut/1.99.13        stable     gcc/4.8.3 openmpi/1.6.5 hdf5/1.8.14
+H5hut/1.99.13        stable     gcc/4.8.3 openmpi/1.8.2 hdf5/1.8.12
+H5hut/1.99.13        stable     gcc/4.8.3 openmpi/1.8.2 hdf5/1.8.14
+H5hut/1.99.13        stable     gcc/4.8.3 openmpi/1.8.4 hdf5/1.8.12
+H5hut/1.99.13        stable     gcc/4.8.3 openmpi/1.8.4 hdf5/1.8.14
+H5hut/1.99.13        stable     gcc/4.8.4 openmpi/1.6.5 hdf5/1.8.12
+H5hut/1.99.13        stable     gcc/4.8.4 openmpi/1.6.5 hdf5/1.8.14
+H5hut/1.99.13        stable     gcc/4.8.4 openmpi/1.8.2 hdf5/1.8.12
+H5hut/1.99.13        stable     gcc/4.8.4 openmpi/1.8.2 hdf5/1.8.14
+H5hut/1.99.13        stable     gcc/4.8.4 openmpi/1.8.4 hdf5/1.8.12
+H5hut/1.99.13        stable     gcc/4.8.4 openmpi/1.8.4 hdf5/1.8.14
+H5hut/1.99.13        stable     gcc/4.8.5 openmpi/1.8.8 hdf5/1.8.12 b:libtool b:autoconf b:automake
+H5hut/1.99.13        stable     gcc/4.9.2 openmpi/1.6.5 hdf5/1.8.12
+H5hut/1.99.13        stable     gcc/4.9.2 openmpi/1.6.5 hdf5/1.8.14
+H5hut/1.99.13        stable     gcc/4.9.2 openmpi/1.8.2 hdf5/1.8.12
+H5hut/1.99.13        stable     gcc/4.9.2 openmpi/1.8.2 hdf5/1.8.14
+H5hut/1.99.13        stable     gcc/4.9.2 openmpi/1.8.4 hdf5/1.8.12
+H5hut/1.99.13        stable     gcc/4.9.2 openmpi/1.8.4 hdf5/1.8.14
diff --git a/HDF5/H5hut/build b/HDF5/H5hut/build
index aa27d0b..151a66d 100755
--- a/HDF5/H5hut/build
+++ b/HDF5/H5hut/build
@@ -1,5 +1,9 @@
 #!/usr/bin/env modbuild
 
+if [[ ${V_MAJOR} == 1 ]]; then
+	pbuild::compile_in_sourcetree
+fi
+
 pbuild::pre_configure() {
 	./autogen.sh
 }
diff --git a/MPI/hdf5/1.8/variants b/MPI/hdf5/1.8/variants
index 6836047..06fe098 100644
--- a/MPI/hdf5/1.8/variants
+++ b/MPI/hdf5/1.8/variants
@@ -7,6 +7,7 @@ hdf5/1.8.12	stable		gcc/4.8.3 openmpi/1.8.4
 hdf5/1.8.12	stable		gcc/4.8.4 openmpi/1.6.5
 hdf5/1.8.12	stable		gcc/4.8.4 openmpi/1.8.2
 hdf5/1.8.12	stable		gcc/4.8.4 openmpi/1.8.4
+hdf5/1.8.12	stable		gcc/4.8.5 openmpi/1.8.8
 hdf5/1.8.12	deprecated	gcc/4.9.2 openmpi/1.6.5
 hdf5/1.8.12	deprecated	gcc/4.9.2 openmpi/1.8.2
 hdf5/1.8.12	deprecated	gcc/4.9.2 openmpi/1.8.4
@@ -35,3 +36,12 @@ hdf5/1.8.16	stable		gcc/5.3.0 openmpi/1.8.8
 hdf5/1.8.16	stable		gcc/5.3.0 openmpi/1.10.2
 hdf5/1.8.16	unstable	gcc/6.1.0 openmpi/1.8.8
 hdf5/1.8.16	unstable	gcc/6.1.0 openmpi/1.10.2
+
+hdf5/1.8.17	unstable	gcc/4.8.5 openmpi/1.8.8
+hdf5/1.8.17	unstable	gcc/4.8.5 openmpi/1.10.2
+hdf5/1.8.17	unstable	gcc/4.9.3 openmpi/1.8.8
+hdf5/1.8.17	unstable	gcc/4.9.3 openmpi/1.10.2
+hdf5/1.8.17	unstable	gcc/5.3.0 openmpi/1.8.8
+hdf5/1.8.17	unstable	gcc/5.3.0 openmpi/1.10.2
+hdf5/1.8.17	unstable	gcc/6.1.0 openmpi/1.8.8
+hdf5/1.8.17	unstable	gcc/6.1.0 openmpi/1.10.2
diff --git a/Tools/gnuplot/5/variants b/Tools/gnuplot/5/variants
new file mode 100644
index 0000000..3b8d4f5
--- /dev/null
+++ b/Tools/gnuplot/5/variants
@@ -0,0 +1 @@
+gnuplot/5.0.4	unstable
diff --git a/Tools/gnuplot/build b/Tools/gnuplot/build
index 1fd2631..5b72923 100755
--- a/Tools/gnuplot/build
+++ b/Tools/gnuplot/build
@@ -10,7 +10,6 @@ pbuild::configure() {
 
 pbuild::add_to_group 'Tools'
 pbuild::set_docfiles 'Copyright' 'ChangeLog' 'NEWS' 'README'
-pbuild::set_build_dependencies "${COMPILER}"
 pbuild::make_all
 
 # Local Variables:
diff --git a/bin/check_releases b/bin/check_releases
new file mode 100644
index 0000000..a1038b4
--- /dev/null
+++ b/bin/check_releases
@@ -0,0 +1,7 @@
+#!/bin/bash
+
+# loop over all modules
+#     get release of module
+#     if stable: all runtime dependencies must be stable
+#     if unstable: all runtime dependencies must be stable or unstable
+#     if deprecated: release of runtime dependencies does not matter
diff --git a/bin/manage_variants b/bin/manage_variants
index fe8b725..2efe8b5 100755
--- a/bin/manage_variants
+++ b/bin/manage_variants
@@ -20,7 +20,7 @@ while read -a toks; do
 	release=${toks[1]}
 	dependencies=( ${toks[@]:2} )
 
-	"${buildblock}"  "${module#*/}" --release=${release} "${dependencies[@]/#/--with=}"
+	"${buildblock}"  "${module#*/}" "${dependencies[@]/#/--with=}"
 	if [[ $? != 0 ]]; then
 		echo "Failed building:  ${module} --release=${release} ${dependencies[@]/#/--with=}" 1>&2
 		exit 42