diff --git a/sci-libs/hdf5/hdf5-1.8.18.recipe b/sci-libs/hdf5/hdf5-1.8.18.recipe
index 3d29af277..6982ae4db 100644
--- a/sci-libs/hdf5/hdf5-1.8.18.recipe
+++ b/sci-libs/hdf5/hdf5-1.8.18.recipe
@@ -6,7 +6,7 @@ HOMEPAGE="http://www.hdfgroup.org/HDF5/"
 COPYRIGHT="2011-2016 The HDF Group,
 	The Board of Trustees of the University of Illinois."
 LICENSE="BSD (3-clause)"
-REVISION="1"
+REVISION="2"
 SOURCE_URI="https://support.hdfgroup.org/ftp/HDF5/current18/src/hdf5-$portVersion.tar.gz"
 CHECKSUM_SHA256="cdb195ad8d9e6782acf24b2488061289f615628c2ccda8457b0a0c3fb7a8a063"
 
@@ -34,12 +34,12 @@ PROVIDES="
 	cmd:h5repart$secondaryArchSuffix
 	cmd:h5stat$secondaryArchSuffix
 	cmd:h5unjam$secondaryArchSuffix
-	lib:libhdf5$secondaryArchSuffix = $portVersion compat >= 10
-	lib:libhdf5_cpp$secondaryArchSuffix = $portVersion compat >= 13
-	lib:libhdf5_fortran$secondaryArchSuffix = $portVersion compat >= 0
-	lib:libhdf5_hl$secondaryArchSuffix = $portVersion compat >= 10
-	lib:libhdf5_hl_cpp$secondaryArchSuffix = $portVersion compat >= 11
-	lib:libhdf5hl_fortran$secondaryArchSuffix = $portVersion compat >= 10
+	lib:libhdf5$secondaryArchSuffix = 10.2.1 compat >= 10
+	lib:libhdf5_cpp$secondaryArchSuffix = 13.0.0 compat >= 13
+	lib:libhdf5_fortran$secondaryArchSuffix = 10.0.4 compat >= 0
+	lib:libhdf5_hl$secondaryArchSuffix = 10.1.1 compat >= 10
+	lib:libhdf5_hl_cpp$secondaryArchSuffix = 11.1.0 compat >= 11
+	lib:libhdf5hl_fortran$secondaryArchSuffix = 10.0.3 compat >= 10
 	"
 REQUIRES="
 	haiku$secondaryArchSuffix
@@ -51,12 +51,12 @@ REQUIRES="
 
 PROVIDES_devel="
 	libhdf5${secondaryArchSuffix}_devel = $portVersion
-	devel:libhdf5$secondaryArchSuffix = $portVersion compat >= 10
-	devel:libhdf5_cpp$secondaryArchSuffix = $portVersion compat >= 13
-	devel:libhdf5_fortran$secondaryArchSuffix = $portVersion compat >= 0
-	devel:libhdf5_hl$secondaryArchSuffix = $portVersion compat >= 10
-	devel:libhdf5_hl_cpp$secondaryArchSuffix = $portVersion compat >= 11
-	devel:libhdf5hl_fortran$secondaryArchSuffix = $portVersion compat >= 10
+	devel:libhdf5$secondaryArchSuffix = 10.2.1 compat >= 10
+	devel:libhdf5_cpp$secondaryArchSuffix = 13.0.0 compat >= 13
+	devel:libhdf5_fortran$secondaryArchSuffix = 10.0.4 compat >= 0
+	devel:libhdf5_hl$secondaryArchSuffix = 10.1.1 compat >= 10
+	devel:libhdf5_hl_cpp$secondaryArchSuffix = 11.1.0 compat >= 11
+	devel:libhdf5hl_fortran$secondaryArchSuffix = 10.0.3 compat >= 10
 	"
 REQUIRES_devel="
 	libhdf5$secondaryArchSuffix == $portVersion base
@@ -83,15 +83,15 @@ BUILD_PREREQUIRES="
 
 BUILD()
 {
-	autoreconf -i
+	autoreconf -fi
 	runConfigure ./configure \
 		--enable-hl \
-		--disable-threadsafe \
-		--enable-build-mode=production \
+		--enable-production \
 		--enable-fortran \
 		--enable-fortran2003 \
 		--enable-cxx \
-		--disable-sharedlib-rpath
+		--disable-sharedlib-rpath \
+		--disable-threadsafe
 	make $jobArgs
 }