diff --git a/HDF5/H5hut/1.99/variants b/HDF5/H5hut/1.99/variants
deleted file mode 100644
index 89a54ed..0000000
--- a/HDF5/H5hut/1.99/variants
+++ /dev/null
@@ -1,25 +0,0 @@
-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 d167828..75790b4 100755
--- a/HDF5/H5hut/build
+++ b/HDF5/H5hut/build
@@ -1,6 +1,6 @@
 #!/usr/bin/env modbuild
 
-pbuild::set_download_url "http://amas.web.psi.ch/Downloads/$P/$P-$V.tar.gz"
+pbuild::set_download_url "http://amas.web.psi.ch/Downloads/$P/$P-${V_PKG}.tar.gz"
 pbuild::add_to_group 'HDF5'
 pbuild::install_docfiles 'AUTHORS' 'COPYING'
 
@@ -8,32 +8,27 @@ if [[ ${V_MAJOR} == 1 ]]; then
 	pbuild::compile_in_sourcetree
 fi
 
-pbuild::pre_configure() {
-	: ./autogen.sh
+pbuild::post_prep() {
+	./autogen.sh
 }
 
-pbuild::configure() {
+pbuild::pre_configure() {
+	pbuild::add_configure_args "--enable-parallel"
+	pbuild::add_configure_args "--enable-debug"
+	pbuild::add_configure_args "--enable-shared"
+	pbuild::add_configure_args "--with-hdf5=$HDF5_PREFIX"
+	pbuild::add_configure_args "--with-pic"
 	if (( V_MAJOR >= 2 )); then
-		: config_args+=" --enable-python"
+		: pbuild::add_configure_args "--enable-python"
 	fi
 	case "${COMPILER}" in
 		"clang-macos" )
 			:
 			;;
 		* )
-			config_args+='--enable-fortran'
+			pbuild::add_configure_args '--enable-fortran'
 			;;
 	esac
-
-	"${SRC_DIR}"/configure \
-		--prefix="${PREFIX}" \
-		--enable-parallel \
-		--enable-debug \
-		--enable-shared \
-		--with-hdf5=$HDF5_PREFIX \
-		--with-pic \
-		${config_args} \
-		|| exit 1
 }
 
 pbuild::compile() {
diff --git a/HDF5/H5hut/2/variants.Edison b/HDF5/H5hut/files/variants.Edison
similarity index 100%
rename from HDF5/H5hut/2/variants.Edison
rename to HDF5/H5hut/files/variants.Edison
diff --git a/HDF5/H5hut/2/variants.macos1014 b/HDF5/H5hut/files/variants.macos1014
similarity index 100%
rename from HDF5/H5hut/2/variants.macos1014
rename to HDF5/H5hut/files/variants.macos1014
diff --git a/HDF5/H5hut/2/variants b/HDF5/H5hut/files/variants.rhel6
similarity index 95%
rename from HDF5/H5hut/2/variants
rename to HDF5/H5hut/files/variants.rhel6
index ea3b5f2..bdad738 100644
--- a/HDF5/H5hut/2/variants
+++ b/HDF5/H5hut/files/variants.rhel6
@@ -1,3 +1,5 @@
+H5hut/1.99.13	deprecated      gcc/{4.7.4,4.8.3,4.8.4,4.9.2} openmpi/{1.6.5,1.8.2,1.8.4} hdf5/{1.8.12,1.8.14}
+
 H5hut/2.0.0rc2	deprecated	gcc/4.8.5 openmpi/1.10.2 hdf5/1.8.17 b:automake/1.14 b:autoconf/2.69 b:libtool/2.4.2 b:Python/2.7.12 b:parmetis/4.0.3
 
 H5hut/2.0.0rc3	deprecated	gcc/5.4.0 openmpi/1.10.4 hdf5/1.8.17 b:automake/1.14 b:autoconf/2.69 b:libtool/2.4.2 b:Python/2.7.12 b:parmetis/4.0.3