diff --git a/.mailmap b/.mailmap
index df0a82a1977337dd1f58f3c68cbbf6ef9eaa41b2..41575ebb1f85d0899cd789ee4af4a3e5137c1617 100644
--- a/.mailmap
+++ b/.mailmap
@@ -3,6 +3,7 @@ Adam Moody <moody20@llnl.gov> Adam T. Moody
Alfredo Gimenez <gimenez1@llnl.gov> Alfredo Gimenez <alfredo.gimenez@gmail.com>
Alfredo Gimenez <gimenez1@llnl.gov> Alfredo Adolfo Gimenez <alfredo.gimenez@gmail.com>
Andrew Williams <williamsa89@cardiff.ac.uk> Andrew Williams <andrew@alshain.org.uk>
+Axel Huebl <a.huebl@hzdr.de> Axel Huebl <axel.huebl@plasma.ninja>
Ben Boeckel <ben.boeckel@kitware.com> Ben Boeckel <mathstuf@gmail.com>
Ben Boeckel <ben.boeckel@kitware.com> Ben Boeckel <mathstuf@users.noreply.github.com>
Benedikt Hegner <hegner@cern.ch> Benedikt Hegner <benedikt.hegner@cern.ch>
diff --git a/var/spack/repos/builtin/packages/adios/package.py b/var/spack/repos/builtin/packages/adios/package.py
index 8241eed34d27506e92db26f66ec30bf790b60884..2efb487ac24568f13568deb0c0bdd51014b2c529 100644
--- a/var/spack/repos/builtin/packages/adios/package.py
+++ b/var/spack/repos/builtin/packages/adios/package.py
@@ -34,6 +34,7 @@ class Adios(AutotoolsPackage):
homepage = "http://www.olcf.ornl.gov/center-projects/adios/"
url = "https://github.com/ornladios/ADIOS/archive/v1.12.0.tar.gz"
+ maintainers = ['ax3l']
version('develop', git='https://github.com/ornladios/ADIOS.git',
branch='master')
diff --git a/var/spack/repos/builtin/packages/adios2/package.py b/var/spack/repos/builtin/packages/adios2/package.py
index a222477c2daacd59bcc142ad5d6e8f7e2ff260f9..8752a1827162aa059774308365b6e9d3bd51e6dd 100644
--- a/var/spack/repos/builtin/packages/adios2/package.py
+++ b/var/spack/repos/builtin/packages/adios2/package.py
@@ -30,6 +30,7 @@ class Adios2(CMakePackage):
homepage = "https://www.olcf.ornl.gov/center-projects/adios/"
url = "https://github.com/ornladios/ADIOS2/archive/v2.0.0.tar.gz"
+ maintainers = ['ax3l']
version('develop', branch='master',
git='https://github.com/ornladios/ADIOS2.git')
diff --git a/var/spack/repos/builtin/packages/cuda-memtest/package.py b/var/spack/repos/builtin/packages/cuda-memtest/package.py
index d7a4e2a04a62330851edf97a77dde1e4cef2c3bf..aef9ed892b96000173393552ee7d05b93e14cdef 100644
--- a/var/spack/repos/builtin/packages/cuda-memtest/package.py
+++ b/var/spack/repos/builtin/packages/cuda-memtest/package.py
@@ -36,6 +36,7 @@ class CudaMemtest(CMakePackage):
homepage = "https://github.com/ComputationalRadiationPhysics/cuda_memtest"
url = "https://github.com/ComputationalRadiationPhysics/cuda_memtest.git"
+ maintainers = ['ax3l']
version('master', branch='dev',
git='https://github.com/ComputationalRadiationPhysics/cuda_memtest.git')
diff --git a/var/spack/repos/builtin/packages/gearshifft/package.py b/var/spack/repos/builtin/packages/gearshifft/package.py
index a2c3942347248825d22e91091abc72f1d96b9cbb..c1a74ce34d3288277648777320ffcdb8644097b2 100644
--- a/var/spack/repos/builtin/packages/gearshifft/package.py
+++ b/var/spack/repos/builtin/packages/gearshifft/package.py
@@ -30,6 +30,7 @@ class Gearshifft(CMakePackage):
homepage = "https://github.com/mpicbg-scicomp/gearshifft"
url = "https://github.com/mpicbg-scicomp/gearshifft/archive/v0.2.0.tar.gz"
+ maintainers = ['ax3l']
version('0.2.1-lw', 'c3208b767b24255b488a83e5d9e517ea')
diff --git a/var/spack/repos/builtin/packages/isaac-server/package.py b/var/spack/repos/builtin/packages/isaac-server/package.py
index 3bfad09f98ac122602090dd0bc0085c9db56e82f..9ae45137ecb3fdf5f054d6215c33b28e43229b5d 100644
--- a/var/spack/repos/builtin/packages/isaac-server/package.py
+++ b/var/spack/repos/builtin/packages/isaac-server/package.py
@@ -30,6 +30,7 @@ class IsaacServer(CMakePackage):
homepage = "http://computationalradiationphysics.github.io/isaac/"
url = "https://github.com/ComputationalRadiationPhysics/isaac/archive/v1.3.0.tar.gz"
+ maintainers = ['ax3l']
version('develop', branch='dev',
git='https://github.com/ComputationalRadiationPhysics/isaac.git')
diff --git a/var/spack/repos/builtin/packages/isaac/package.py b/var/spack/repos/builtin/packages/isaac/package.py
index 4c05faeb26698714d70769cc9bb97c9ab72446e2..72bbaed8a7a81c942bbe86e39c0a94b7ae8fc451 100644
--- a/var/spack/repos/builtin/packages/isaac/package.py
+++ b/var/spack/repos/builtin/packages/isaac/package.py
@@ -30,6 +30,7 @@ class Isaac(CMakePackage):
homepage = "http://computationalradiationphysics.github.io/isaac/"
url = "https://github.com/ComputationalRadiationPhysics/isaac/archive/v1.3.0.tar.gz"
+ maintainers = ['ax3l']
version('develop', branch='dev',
git='https://github.com/ComputationalRadiationPhysics/isaac.git')
diff --git a/var/spack/repos/builtin/packages/jansson/package.py b/var/spack/repos/builtin/packages/jansson/package.py
index e3e2d56cffd26d53d720a02f4be77d3a1971baa0..7379c6ef19148f663f45423da9ca5235cc493315 100644
--- a/var/spack/repos/builtin/packages/jansson/package.py
+++ b/var/spack/repos/builtin/packages/jansson/package.py
@@ -31,6 +31,7 @@ class Jansson(CMakePackage):
homepage = "http://www.digip.org/jansson/"
url = "https://github.com/akheron/jansson/archive/v2.9.tar.gz"
+ maintainers = ['ax3l']
version('2.9', 'd2db25c437b359fc5a065ed938962237')
diff --git a/var/spack/repos/builtin/packages/libsplash/package.py b/var/spack/repos/builtin/packages/libsplash/package.py
index b710dae58cf6715d0a9f71a17d7790cc70846cf0..283de4f954daacdd8a90cc933239bc7b32559f03 100644
--- a/var/spack/repos/builtin/packages/libsplash/package.py
+++ b/var/spack/repos/builtin/packages/libsplash/package.py
@@ -36,6 +36,7 @@ class Libsplash(CMakePackage):
homepage = "https://github.com/ComputationalRadiationPhysics/libSplash"
url = "https://github.com/ComputationalRadiationPhysics/libSplash/archive/v1.4.0.tar.gz"
+ maintainers = ['ax3l']
version('develop', branch='dev',
git='https://github.com/ComputationalRadiationPhysics/libSplash.git')
diff --git a/var/spack/repos/builtin/packages/libwebsockets/package.py b/var/spack/repos/builtin/packages/libwebsockets/package.py
index 0b027935540d597191d30d2b00bdfc8362652faf..88b2e66ad7e9e187b55047b003b5c200ceb6f765 100644
--- a/var/spack/repos/builtin/packages/libwebsockets/package.py
+++ b/var/spack/repos/builtin/packages/libwebsockets/package.py
@@ -30,6 +30,7 @@ class Libwebsockets(CMakePackage):
homepage = "https://github.com/warmcat/libwebsockets"
url = "https://github.com/warmcat/libwebsockets/archive/v2.1.0.tar.gz"
+ maintainers = ['ax3l']
version('2.2.1', '1f641cde2ab3687db3d553f68fe0f620')
version('2.1.1', '674684ffb90d4a0bcf7a075eb7b90192')
diff --git a/var/spack/repos/builtin/packages/mallocmc/package.py b/var/spack/repos/builtin/packages/mallocmc/package.py
index ed8ba9bdeb5f53212a3657e15e0d7cddd56721f4..d110a6a17f8290c12664b96caed44a9e509e5227 100644
--- a/var/spack/repos/builtin/packages/mallocmc/package.py
+++ b/var/spack/repos/builtin/packages/mallocmc/package.py
@@ -39,6 +39,7 @@ class Mallocmc(CMakePackage):
homepage = "https://github.com/ComputationalRadiationPhysics/mallocMC"
url = "https://github.com/ComputationalRadiationPhysics/mallocMC/archive/2.2.0crp.tar.gz"
+ maintainers = ['ax3l']
version('develop', branch='dev',
git='https://github.com/ComputationalRadiationPhysics/mallocMC.git')
diff --git a/var/spack/repos/builtin/packages/pngwriter/package.py b/var/spack/repos/builtin/packages/pngwriter/package.py
index 896b660ac64296bba2f14bc5c0373d11c42cbd8c..e1709896934354af22cb1c3a215fe617f31aa3ec 100644
--- a/var/spack/repos/builtin/packages/pngwriter/package.py
+++ b/var/spack/repos/builtin/packages/pngwriter/package.py
@@ -37,6 +37,7 @@ class Pngwriter(CMakePackage):
homepage = "http://pngwriter.sourceforge.net/"
url = "https://github.com/pngwriter/pngwriter/archive/0.5.6.tar.gz"
+ maintainers = ['ax3l']
version('develop', branch='dev',
git='https://github.com/pngwriter/pngwriter.git')
diff --git a/var/spack/repos/builtin/packages/xsimd/package.py b/var/spack/repos/builtin/packages/xsimd/package.py
index e2000277c0ce05a875cc10177e8d985c806b9cfd..ec177fe4a06526afa3a32ebea3a43309dd19a6f6 100644
--- a/var/spack/repos/builtin/packages/xsimd/package.py
+++ b/var/spack/repos/builtin/packages/xsimd/package.py
@@ -30,6 +30,7 @@ class Xsimd(CMakePackage):
homepage = "http://quantstack.net/xsimd"
url = "https://github.com/QuantStack/xsimd/archive/3.1.0.tar.gz"
+ maintainers = ['ax3l']
version('develop', branch='master',
git='https://github.com/QuantStack/xsimd.git')
diff --git a/var/spack/repos/builtin/packages/xtensor/package.py b/var/spack/repos/builtin/packages/xtensor/package.py
index ad559d84f741fd3d9ee7c1b5f2630134f8de6162..b8a0a2b75ca8d11a1bbbfa73ecadd0f40e4d3c30 100644
--- a/var/spack/repos/builtin/packages/xtensor/package.py
+++ b/var/spack/repos/builtin/packages/xtensor/package.py
@@ -30,6 +30,7 @@ class Xtensor(CMakePackage):
homepage = "http://quantstack.net/xtensor"
url = "https://github.com/QuantStack/xtensor/archive/0.13.1.tar.gz"
+ maintainers = ['ax3l']
version('develop', branch='master',
git='https://github.com/QuantStack/xtensor.git')
diff --git a/var/spack/repos/builtin/packages/xtl/package.py b/var/spack/repos/builtin/packages/xtl/package.py
index c75579848750f321eb33514652cfc694b6ecb5de..77661865a103b1068a5816d77e758d9635df4e05 100644
--- a/var/spack/repos/builtin/packages/xtl/package.py
+++ b/var/spack/repos/builtin/packages/xtl/package.py
@@ -30,6 +30,7 @@ class Xtl(CMakePackage):
homepage = "https://github.com/QuantStack/xtl"
url = "https://github.com/QuantStack/xtl/archive/0.3.4.tar.gz"
+ maintainers = ['ax3l']
version('develop', branch='master',
git='https://github.com/QuantStack/xtl.git')