diff --git a/srcpkgs/base-chroot-musl/template b/srcpkgs/base-chroot-musl/template
index 8e89261b1af..c95e27a9527 100644
--- a/srcpkgs/base-chroot-musl/template
+++ b/srcpkgs/base-chroot-musl/template
@@ -7,7 +7,7 @@ bootstrap=yes
 build_style=meta
 homepage="https://www.voidlinux.org"
 short_desc="Bootstrap packages for xbps-src (musl libc)"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Enno Boland <gottox@voidlinux.org>"
 license="Public domain"
 
 conflicts="base-chroot>=0"
diff --git a/srcpkgs/base-chroot/template b/srcpkgs/base-chroot/template
index bc16fadad10..972039909fd 100644
--- a/srcpkgs/base-chroot/template
+++ b/srcpkgs/base-chroot/template
@@ -7,7 +7,7 @@ bootstrap=yes
 build_style=meta
 homepage="http://www.voidlinux.org"
 short_desc="Bootstrap packages for xbps-src"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Enno Boland <gottox@voidlinux.org>"
 license="Public domain"
 
 depends="
diff --git a/srcpkgs/base-files/template b/srcpkgs/base-files/template
index f7089fceb8f..672855e8671 100644
--- a/srcpkgs/base-files/template
+++ b/srcpkgs/base-files/template
@@ -5,7 +5,7 @@ revision=6
 bootstrap=yes
 depends="xbps-triggers"
 short_desc="Void Linux base system files"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Enno Boland <orphan@voidlinux.org>"
 license="Public domain"
 homepage="https://www.voidlinux.org"
 conf_files="
diff --git a/srcpkgs/base-system/template b/srcpkgs/base-system/template
index ef5e24fd7e6..43785165924 100644
--- a/srcpkgs/base-system/template
+++ b/srcpkgs/base-system/template
@@ -5,7 +5,7 @@ version=0.112
 revision=6
 build_style=meta
 short_desc="Void Linux base system meta package"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Enno Boland <gottox@voidlinux.org>"
 license="Public domain"
 homepage="https://www.voidlinux.org"
 
diff --git a/srcpkgs/base-voidstrap/template b/srcpkgs/base-voidstrap/template
index 8a86e49577b..01e29a35df1 100644
--- a/srcpkgs/base-voidstrap/template
+++ b/srcpkgs/base-voidstrap/template
@@ -5,7 +5,7 @@ revision=3
 build_style=meta
 homepage="http://www.voidlinux.org/"
 short_desc="Void Linux base system meta package for containers/chroots"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Enno Boland <gottox@voidlinux.org>"
 license="Public domain"
 
 depends="