diff --git a/srcpkgs/armadillo/template b/srcpkgs/armadillo/template
index d1bdfc5de3..5a5c3351fa 100644
--- a/srcpkgs/armadillo/template
+++ b/srcpkgs/armadillo/template
@@ -1,17 +1,27 @@
 # Template file for 'armadillo'
 pkgname=armadillo
-version=7.800.2
+version=7.960.0
 revision=1
 build_style=cmake
-hostmakedepends="pkg-config"
+hostmakedepends="pkg-config openblas-devel"
 makedepends="openblas-devel superlu-devel"
 short_desc="C++ linear algebra library"
 maintainer="Julien Dehos <dehos@lisic.univ-littoral.fr>"
 license="BSD"
 homepage="http://arma.sourceforge.net/"
 distfiles="${SOURCEFORGE_SITE}/arma/${pkgname}-${version}.tar.xz"
-checksum=efd70600ab6f30449d90a3e58ff7499937985209bb0a03ce4e322474dbf11fe3
-configure_args="-DINSTALL_LIB_DIR=/usr/lib"
+checksum=8ea919c4312ec43d454f61fdd0e34282f94739eb51adc78d21176717143cfd32
+
+# automatically link to openblas (so you just have to compile with
+# "-larmadillo" instead of "-larmadillo -lopenblas")
+configure_args="-DLAPACK_LIBRARY=/usr/lib/libopenblas.so"
+
+build_options="hdf5"
+if [ -z "$CROSS_BUILD" ]; then
+	build_options_default="hdf5"
+fi
+makedepends+=" $(vopt_if hdf5 hdf5-devel)"
+configure_args+=" $(vopt_if hdf5 -DDETECT_HDF5=ON)"
 
 post_install() {
 	vlicense LICENSE.txt