diff --git a/MPI/MITHRA/build b/MPI/MITHRA/build
new file mode 100755
index 0000000000000000000000000000000000000000..c962c11ddcbfb6a8aabe49d0a264c127929cb81e
--- /dev/null
+++ b/MPI/MITHRA/build
@@ -0,0 +1,32 @@
+#!/usr/bin/env modbuild
+
+case ${V_PKG} in
+2020.8.27 )
+	commit='0bf2a64'
+	;;
+2.0.0 )
+	commit='21f8119'
+	;;
+* )
+	echo "Unsupported version!" 1>&2
+	;;
+esac
+
+
+pbuild::set_download_url "https://github.com/arnaualba/mithra/archive/${commit}.tar.gz"
+pbuild::add_to_group 'MPI'
+
+#pbuild::install_docfiles 'license.txt'
+pbuild::install_docfiles 'README.md'
+
+pbuild::compile_in_sourcetree
+
+pbuild::configure() {
+	:
+}
+
+# Local Variables:
+# mode: sh
+# sh-basic-offset: 8
+# tab-width: 8
+# End:
diff --git a/MPI/MITHRA/files/variants.rhel6 b/MPI/MITHRA/files/variants.rhel6
new file mode 100644
index 0000000000000000000000000000000000000000..e0e8037bb2ee3071108e90af1cfee31afe4c15aa
--- /dev/null
+++ b/MPI/MITHRA/files/variants.rhel6
@@ -0,0 +1,2 @@
+MITHRA/2020.8.27	unstable	gcc/8.4.0 openmpi/3.1.6
+MITHRA/2.0.0		unstable	gcc/8.4.0 openmpi/3.1.6
diff --git a/MPI/MITHRA/files/variants.slurm b/MPI/MITHRA/files/variants.slurm
new file mode 100644
index 0000000000000000000000000000000000000000..ef5e6c37bc66331f22af9ac608541ad39f00a3f4
--- /dev/null
+++ b/MPI/MITHRA/files/variants.slurm
@@ -0,0 +1,2 @@
+MITHRA/2020.8.27_slurm	unstable	gcc/8.4.0 openmpi/3.1.6_slurm
+MITHRA/2.0.0_slurm	unstable	gcc/8.4.0 openmpi/3.1.6_slurm
diff --git a/MPI/MITHRA/modulefile b/MPI/MITHRA/modulefile
new file mode 100644
index 0000000000000000000000000000000000000000..eb1f1ecb079c4ab275fd831a45c3dcfc4ab536d5
--- /dev/null
+++ b/MPI/MITHRA/modulefile
@@ -0,0 +1,9 @@
+#%Module1.0
+
+module-whatis		"full-wave numerical solver for free-electron lasers."
+module-url		"https://github.com/arnaualba/mithra"
+module-license		"none"
+module-maintainer	"Achim Gsell <achim.gsell@psi.ch>"
+module-help 		"
+MITHRA is a full-wave numerical solver for free-electron lasers.
+"