diff --git a/sci-libs/armadillo/armadillo-10.8.2.recipe b/sci-libs/armadillo/armadillo-12.2.0.recipe
similarity index 95%
rename from sci-libs/armadillo/armadillo-10.8.2.recipe
rename to sci-libs/armadillo/armadillo-12.2.0.recipe
index 47be42ebe..63e19d096 100644
--- a/sci-libs/armadillo/armadillo-10.8.2.recipe
+++ b/sci-libs/armadillo/armadillo-12.2.0.recipe
@@ -11,8 +11,7 @@ COPYRIGHT="2008-2020 Conrad Sanderson
 LICENSE="Apache v2"
 REVISION="2"
 SOURCE_URI="https://downloads.sourceforge.net/arma/armadillo-$portVersion.tar.xz"
-CHECKSUM_SHA256="89fdd898bf6bff75f6efc3a301817e4ede752b9a80927fb07ee358b13e353922"
-SOURCE_DIR="armadillo-$portVersion"
+CHECKSUM_SHA256="b0dce042297e865add3351dad77f78c2c7638d6632f58357b015e50edcbd2186"
 
 ARCHITECTURES="all !x86_gcc2"
 SECONDARY_ARCHITECTURES="x86"
@@ -75,7 +74,6 @@ BUILD()
 {
 	cmake -Bbuild -S. -DCMAKE_BUILD_TYPE=RelWithDebInfo \
 		$cmakeDirArgs \
-		-DDETECT_HDF5=ON \
 		-DBUILD_SHARED_LIBS=ON
 	make -C build $jobArgs
 }
diff --git a/sci-libs/armadillo/armadillo10-10.8.2.recipe b/sci-libs/armadillo/armadillo10-10.8.2.recipe
new file mode 100644
index 000000000..2a408c376
--- /dev/null
+++ b/sci-libs/armadillo/armadillo10-10.8.2.recipe
@@ -0,0 +1,113 @@
+SUMMARY="A C++ linear algebra library"
+DESCRIPTION="The library provides efficient classes for vectors, matrices and \
+cubes, as well as 200+ associated functions (eg. contiguous and non-contiguous \
+submatrix views). Various matrix decompositions are provided through \
+integration with LAPACK, or one of its high performance drop-in replacements."
+HOMEPAGE="http://arma.sourceforge.net/"
+COPYRIGHT="2008-2020 Conrad Sanderson
+	2008-2016 National ICT Australia (NICTA)
+	2017-2020 Arroyo Consortium
+	2017-2020 Data61, CSIRO"
+LICENSE="Apache v2"
+REVISION="2"
+SOURCE_URI="https://downloads.sourceforge.net/arma/armadillo-$portVersion.tar.xz"
+CHECKSUM_SHA256="89fdd898bf6bff75f6efc3a301817e4ede752b9a80927fb07ee358b13e353922"
+SOURCE_DIR="armadillo-$portVersion"
+
+ARCHITECTURES="all !x86_gcc2"
+SECONDARY_ARCHITECTURES="x86"
+
+libVersion="$portVersion"
+libVersionCompat="$libVersion compat >= ${libVersion%%.*}"
+
+PROVIDES="
+	armadillo10$secondaryArchSuffix = $portVersion
+	lib:libarmadillo$secondaryArchSuffix = $libVersionCompat
+	"
+REQUIRES="
+	haiku$secondaryArchSuffix
+	lib:libarpack$secondaryArchSuffix
+	lib:libhdf5$secondaryArchSuffix
+	lib:liblapack$secondaryArchSuffix
+	lib:libopenblas$secondaryArchSuffix
+	lib:libsuperlu$secondaryArchSuffix
+	lib:libz$secondaryArchSuffix
+	"
+
+PROVIDES_devel="
+	armadillo10${secondaryArchSuffix}_devel = $portVersion
+	devel:libarmadillo$secondaryArchSuffix = $libVersionCompat
+	"
+REQUIRES_devel="
+	armadillo10$secondaryArchSuffix == $portVersion base
+	"
+CONFLICTS_devel="
+	armadillo${secondaryArchSuffix}_devel
+	"
+
+BUILD_REQUIRES="
+	haiku${secondaryArchSuffix}_devel
+	devel:libarpack$secondaryArchSuffix
+	devel:libhdf5$secondaryArchSuffix
+	devel:liblapack$secondaryArchSuffix
+	devel:libopenblas$secondaryArchSuffix
+	devel:libsuperlu$secondaryArchSuffix
+	devel:libz$secondaryArchSuffix
+	"
+BUILD_PREREQUIRES="
+	cmd:cmake
+	cmd:g++$secondaryArchSuffix
+	cmd:make
+	cmd:pkg_config$secondaryArchSuffix
+	cmd:sed
+	"
+
+defineDebugInfoPackage armadillo10$secondaryArchSuffix \
+	"$libDir"/libarmadillo.so.$libVersion
+
+PATCH()
+{
+	# Enable some optional features
+	sed --regexp-extended -i '/ARMA_USE_(SUPERLU|ARPACK)/s/^\/\///g' include/armadillo_bits/config.hpp
+}
+
+BUILD()
+{
+	cmake -Bbuild -S. -DCMAKE_BUILD_TYPE=RelWithDebInfo \
+		$cmakeDirArgs \
+		-DDETECT_HDF5=ON \
+		-DBUILD_SHARED_LIBS=ON -L
+	make -C build $jobArgs
+}
+
+INSTALL()
+{
+	make -C build install
+
+	mkdir -p $libDir/cmake/
+	cp -r $dataDir/Armadillo/CMake/. $libDir/cmake/.
+	rm -rf $dataDir/Armadillo/
+
+	prepareInstalledDevelLib libarmadillo
+
+	sed  -i "1i prefix=$prefix" \
+		$libDir/pkgconfig/armadillo.pc
+
+	fixPkgconfig
+
+	packageEntries devel \
+		$developDir \
+		$libDir/cmake
+}
+
+TEST()
+{
+	export LIBRARY_PATH=$LIBRARY_PATH:$sourceDir/build
+	export CPLUS_INCLUDE_PATH=$CPLUS_INCLUDE_PATH:$sourceDir/include
+
+	sed -i "s|LIB_FLAGS = -larmadillo|LIB_FLAGS = -lopenblas -llapack -larpack -lsuperlu -larmadillo -L$sourceDir/build|g" tests/Makefile
+
+	make -C tests all $jobArgs
+
+	./tests/main
+}