diff --git a/Compiler/eigen/build b/Compiler/eigen/build
new file mode 100755
index 0000000..40b2fec
--- /dev/null
+++ b/Compiler/eigen/build
@@ -0,0 +1,21 @@
+#!/usr/bin/env modbuild
+#
+
+pbuild::add_to_group 'Compiler'
+pbuild::set_download_url "https://gitlab.com/libeigen/$P/-/archive/${V_PKG}/$P-${V_PKG}.tar.bz2"
+
+pbuild::pre_configure(){
+        pbuild::add_configure_args "-DINCLUDE_INSTALL_DIR=${PREFIX}/include"
+}
+
+pbuild::post_install(){
+	cd "${PREFIX}/include"
+	ln -s . eigen3
+}
+
+# Local Variables:
+# mode: sh
+# sh-basic-offset: 8
+# tab-width: 8
+# End:
+
diff --git a/Compiler/eigen/files/variants.yaml b/Compiler/eigen/files/variants.yaml
new file mode 100644
index 0000000..3402a9a
--- /dev/null
+++ b/Compiler/eigen/files/variants.yaml
@@ -0,0 +1,8 @@
+overlay: base
+relstage: stable
+eigen/3.3.9:
+- with: gcc/{7.5.0,8.4.0,8.5.0,9.3.0,9.5.0,10.3.0,11.2.0,11.3.0,12.1.0}
+  dependencies: b:cmake/3.15.5
+eigen/3.4.0:
+- with: gcc/{7.5.0,8.4.0,8.5.0,9.3.0,9.5.0,10.3.0,11.2.0,11.3.0,12.1.0}
+  dependencies: b:cmake/3.15.5
diff --git a/Compiler/eigen/modulefile b/Compiler/eigen/modulefile
new file mode 100644
index 0000000..5e4e3fa
--- /dev/null
+++ b/Compiler/eigen/modulefile
@@ -0,0 +1,11 @@
+#%Module1.0
+
+module-whatis		"a C++ template library for linear algebra:"
+module-url		"http://eigen.tuxfamily.org/"
+module-license		"Mozilla Public License Version 2.0"
+module-maintainer	"Achim Gsell <achim.gsell@psi.ch>"
+
+module-help		"
+Eigen is a C++ template library for linear algebra: matrices, vectors,
+numerical solvers, and related algorithms.
+"
diff --git a/Compiler/eigen3/build b/Compiler/eigen3/build
index edf6aa0..c3efab1 100755
--- a/Compiler/eigen3/build
+++ b/Compiler/eigen3/build
@@ -2,8 +2,7 @@
 #
 
 pbuild::add_to_group 'Compiler'
-pbuild::set_download_url "http://bitbucket.org/eigen/eigen/get/${V_PKG}.tar.bz2"
-
+pbuild::set_download_url "https://gitlab.com/libeigen/$P/-/archive/${V_PKG}/$P-${V_PKG}.tar.bz2"
 pbuild::pre_configure() {
 	export BOOST_ROOT="${BOOST_PREFIX}"
 	pbuild::add_configure_args "-DUMFPACK_INCLUDES=${UMFPACK_INCLUDE_DIR}"
diff --git a/Compiler/eigen3/files/variants b/Compiler/eigen3/files/variants
index a1ff887..3538ab4 100644
--- a/Compiler/eigen3/files/variants
+++ b/Compiler/eigen3/files/variants
@@ -1,2 +1,2 @@
-eigen3/3.3.4	unstable	gcc/5.4.0 b:cmake/3.6.3 b:mpfr/3.1.5 b:gmp/6.1.2 b:UMFPACK/5.6.2 b:boost/1.62.0 b:SuperLU/5.2.1
-eigen3/3.3.5	unstable	gcc/7.3.0 b:cmake/3.9.6 b:mpfr/4.0.1 b:gmp/6.1.2 b:UMFPACK/5.6.2 b:boost/1.68.0 b:SuperLU/5.2.1
+eigen3/3.3.4	deprecated	gcc/5.4.0 b:cmake/3.6.3 b:mpfr/3.1.5 b:gmp/6.1.2 b:UMFPACK/5.6.2 b:boost/1.62.0 b:SuperLU/5.2.1
+eigen3/3.3.5	deprecated	gcc/7.3.0 b:cmake/3.9.6 b:mpfr/4.0.1 b:gmp/6.1.2 b:UMFPACK/5.6.2 b:boost/1.68.0 b:SuperLU/5.2.1