diff --git a/System/ior/3.2.1/variants b/System/ior/3.2.1/variants
new file mode 100644
index 0000000..59371d2
--- /dev/null
+++ b/System/ior/3.2.1/variants
@@ -0,0 +1 @@
+ior/3.2.1_merlin6  unstable  gcc/9.3.0 openmpi/4.0.4_slurm
diff --git a/System/ior/build b/System/ior/build
index 3253a73..c0c6189 100755
--- a/System/ior/build
+++ b/System/ior/build
@@ -1,18 +1,12 @@
 #!/usr/bin/env modbuild
 
-pbuild::set_download_url "https://github.com/hpc/ior/archive/${V_PKG}.tar.gz"
+pbuild::set_download_url "http://github.com/hpc/ior/releases/download/${V_PKG}/ior-${V_PKG}.tar.gz"
 
 pbuild::add_to_group 'System'
 
-pbuild::install_docfiles AUTHORS NEWS README_S3
+pbuild::install_docfiles AUTHORS NEWS README.md
 
-export GPFS_VERSION="5.0.2-3"
-
-export C_INCLUDE_PATH+=":$BUILDBLOCK_DIR/files/gpfs/$GPFS_VERSION/include/"
-export LIBRARY_PATH+=":$BUILDBLOCK_DIR/files/gpfs/$GPFS_VERSION/lib/"
-
-pbuild::pre_configure() {
-  
+pbuil::configure() {
   cd ${SRC_DIR}
-  ./bootstrap
+  ./configure --prefix="${PREFIX}" 
 }
diff --git a/System/ior/modulefile b/System/ior/modulefile
index 5326213..41de1b4 100644
--- a/System/ior/modulefile
+++ b/System/ior/modulefile
@@ -3,8 +3,11 @@
 module-whatis		"HPC IO Benchmark Repository"
 module-url		"https://github.com/hpc/ior"
 module-license		"See COPYRIGHT"
-module-maintainer	"Marc Caubet <marc.caubet@psi.ch>"
+module-maintainer	"Marc Caubet Serrabou <marc.caubet@psi.ch>"
 module-help		"
 This repo now contains both IOR and mdtest. This should be
 only for stress tests and usually by an administrator.
+
+GPFS presence is checked during compilation time. Hence, is 
+recommended to compile IOR from a system with GPFS.
 "