diff --git a/acct-group/solaar/metadata.xml b/acct-group/solaar/metadata.xml
index 4fa8ff351..1dbf520b5 100644
--- a/acct-group/solaar/metadata.xml
+++ b/acct-group/solaar/metadata.xml
@@ -1,8 +1,8 @@
-
- proxy-maint@gentoo.org
- Proxy Maintainers
+
+ gkroon@maelstrom.ninja
+ Guido Kroon
diff --git a/app-misc/gplaycli/metadata.xml b/app-misc/gplaycli/metadata.xml
index 4fa8ff351..1dbf520b5 100644
--- a/app-misc/gplaycli/metadata.xml
+++ b/app-misc/gplaycli/metadata.xml
@@ -1,8 +1,8 @@
-
- proxy-maint@gentoo.org
- Proxy Maintainers
+
+ gkroon@maelstrom.ninja
+ Guido Kroon
diff --git a/app-officeext/languagetool/metadata.xml b/app-officeext/languagetool/metadata.xml
index 4fa8ff351..1dbf520b5 100644
--- a/app-officeext/languagetool/metadata.xml
+++ b/app-officeext/languagetool/metadata.xml
@@ -1,8 +1,8 @@
-
- proxy-maint@gentoo.org
- Proxy Maintainers
+
+ gkroon@maelstrom.ninja
+ Guido Kroon
diff --git a/app-text/cewl/metadata.xml b/app-text/cewl/metadata.xml
index 4fa8ff351..1dbf520b5 100644
--- a/app-text/cewl/metadata.xml
+++ b/app-text/cewl/metadata.xml
@@ -1,8 +1,8 @@
-
- proxy-maint@gentoo.org
- Proxy Maintainers
+
+ gkroon@maelstrom.ninja
+ Guido Kroon
diff --git a/app-text/unfurl/metadata.xml b/app-text/unfurl/metadata.xml
index 4fa8ff351..1dbf520b5 100644
--- a/app-text/unfurl/metadata.xml
+++ b/app-text/unfurl/metadata.xml
@@ -1,8 +1,8 @@
-
- proxy-maint@gentoo.org
- Proxy Maintainers
+
+ gkroon@maelstrom.ninja
+ Guido Kroon
diff --git a/dev-db/sqlsus/metadata.xml b/dev-db/sqlsus/metadata.xml
index 4fa8ff351..1dbf520b5 100644
--- a/dev-db/sqlsus/metadata.xml
+++ b/dev-db/sqlsus/metadata.xml
@@ -1,8 +1,8 @@
-
- proxy-maint@gentoo.org
- Proxy Maintainers
+
+ gkroon@maelstrom.ninja
+ Guido Kroon
diff --git a/dev-embedded/libmpsse/metadata.xml b/dev-embedded/libmpsse/metadata.xml
index 4fa8ff351..1dbf520b5 100644
--- a/dev-embedded/libmpsse/metadata.xml
+++ b/dev-embedded/libmpsse/metadata.xml
@@ -1,8 +1,8 @@
-
- proxy-maint@gentoo.org
- Proxy Maintainers
+
+ gkroon@maelstrom.ninja
+ Guido Kroon
diff --git a/dev-embedded/mphidflash/metadata.xml b/dev-embedded/mphidflash/metadata.xml
index 4fa8ff351..1dbf520b5 100644
--- a/dev-embedded/mphidflash/metadata.xml
+++ b/dev-embedded/mphidflash/metadata.xml
@@ -1,8 +1,8 @@
-
- proxy-maint@gentoo.org
- Proxy Maintainers
+
+ gkroon@maelstrom.ninja
+ Guido Kroon
diff --git a/dev-go/fetchbot/metadata.xml b/dev-go/fetchbot/metadata.xml
index 4fa8ff351..1dbf520b5 100644
--- a/dev-go/fetchbot/metadata.xml
+++ b/dev-go/fetchbot/metadata.xml
@@ -1,8 +1,8 @@
-
- proxy-maint@gentoo.org
- Proxy Maintainers
+
+ gkroon@maelstrom.ninja
+ Guido Kroon
diff --git a/dev-go/gopkg-sourcemap/metadata.xml b/dev-go/gopkg-sourcemap/metadata.xml
index 4fa8ff351..1dbf520b5 100644
--- a/dev-go/gopkg-sourcemap/metadata.xml
+++ b/dev-go/gopkg-sourcemap/metadata.xml
@@ -1,8 +1,8 @@
-
- proxy-maint@gentoo.org
- Proxy Maintainers
+
+ gkroon@maelstrom.ninja
+ Guido Kroon
diff --git a/dev-java/jd-core/metadata.xml b/dev-java/jd-core/metadata.xml
index 4fa8ff351..1dbf520b5 100644
--- a/dev-java/jd-core/metadata.xml
+++ b/dev-java/jd-core/metadata.xml
@@ -1,8 +1,8 @@
-
- proxy-maint@gentoo.org
- Proxy Maintainers
+
+ gkroon@maelstrom.ninja
+ Guido Kroon
diff --git a/dev-java/jgraphx/metadata.xml b/dev-java/jgraphx/metadata.xml
index 4fa8ff351..1dbf520b5 100644
--- a/dev-java/jgraphx/metadata.xml
+++ b/dev-java/jgraphx/metadata.xml
@@ -1,8 +1,8 @@
-
- proxy-maint@gentoo.org
- Proxy Maintainers
+
+ gkroon@maelstrom.ninja
+ Guido Kroon
diff --git a/dev-java/msgpack/metadata.xml b/dev-java/msgpack/metadata.xml
index 4fa8ff351..1dbf520b5 100644
--- a/dev-java/msgpack/metadata.xml
+++ b/dev-java/msgpack/metadata.xml
@@ -1,8 +1,8 @@
-
- proxy-maint@gentoo.org
- Proxy Maintainers
+
+ gkroon@maelstrom.ninja
+ Guido Kroon
diff --git a/dev-java/sleep/metadata.xml b/dev-java/sleep/metadata.xml
index 4fa8ff351..1dbf520b5 100644
--- a/dev-java/sleep/metadata.xml
+++ b/dev-java/sleep/metadata.xml
@@ -1,8 +1,8 @@
-
- proxy-maint@gentoo.org
- Proxy Maintainers
+
+ gkroon@maelstrom.ninja
+ Guido Kroon
diff --git a/dev-lang/powershell-bin/metadata.xml b/dev-lang/powershell-bin/metadata.xml
index 4fa8ff351..1dbf520b5 100644
--- a/dev-lang/powershell-bin/metadata.xml
+++ b/dev-lang/powershell-bin/metadata.xml
@@ -1,8 +1,8 @@
-
- proxy-maint@gentoo.org
- Proxy Maintainers
+
+ gkroon@maelstrom.ninja
+ Guido Kroon
diff --git a/dev-libs/keystone/metadata.xml b/dev-libs/keystone/metadata.xml
index 4fa8ff351..1dbf520b5 100644
--- a/dev-libs/keystone/metadata.xml
+++ b/dev-libs/keystone/metadata.xml
@@ -1,8 +1,8 @@
-
- proxy-maint@gentoo.org
- Proxy Maintainers
+
+ gkroon@maelstrom.ninja
+ Guido Kroon
diff --git a/dev-libs/libcdata/metadata.xml b/dev-libs/libcdata/metadata.xml
index 4fa8ff351..1dbf520b5 100644
--- a/dev-libs/libcdata/metadata.xml
+++ b/dev-libs/libcdata/metadata.xml
@@ -1,8 +1,8 @@
-
- proxy-maint@gentoo.org
- Proxy Maintainers
+
+ gkroon@maelstrom.ninja
+ Guido Kroon
diff --git a/dev-libs/libcdatetime/metadata.xml b/dev-libs/libcdatetime/metadata.xml
index 4fa8ff351..1dbf520b5 100644
--- a/dev-libs/libcdatetime/metadata.xml
+++ b/dev-libs/libcdatetime/metadata.xml
@@ -1,8 +1,8 @@
-
- proxy-maint@gentoo.org
- Proxy Maintainers
+
+ gkroon@maelstrom.ninja
+ Guido Kroon
diff --git a/dev-libs/libcerror/metadata.xml b/dev-libs/libcerror/metadata.xml
index 4fa8ff351..1dbf520b5 100644
--- a/dev-libs/libcerror/metadata.xml
+++ b/dev-libs/libcerror/metadata.xml
@@ -1,8 +1,8 @@
-
- proxy-maint@gentoo.org
- Proxy Maintainers
+
+ gkroon@maelstrom.ninja
+ Guido Kroon
diff --git a/dev-libs/libclocale/metadata.xml b/dev-libs/libclocale/metadata.xml
index 4fa8ff351..1dbf520b5 100644
--- a/dev-libs/libclocale/metadata.xml
+++ b/dev-libs/libclocale/metadata.xml
@@ -1,8 +1,8 @@
-
- proxy-maint@gentoo.org
- Proxy Maintainers
+
+ gkroon@maelstrom.ninja
+ Guido Kroon
diff --git a/dev-libs/libcnotify/metadata.xml b/dev-libs/libcnotify/metadata.xml
index 4fa8ff351..1dbf520b5 100644
--- a/dev-libs/libcnotify/metadata.xml
+++ b/dev-libs/libcnotify/metadata.xml
@@ -1,8 +1,8 @@
-
- proxy-maint@gentoo.org
- Proxy Maintainers
+
+ gkroon@maelstrom.ninja
+ Guido Kroon
diff --git a/dev-libs/libcpath/metadata.xml b/dev-libs/libcpath/metadata.xml
index 4fa8ff351..1dbf520b5 100644
--- a/dev-libs/libcpath/metadata.xml
+++ b/dev-libs/libcpath/metadata.xml
@@ -1,8 +1,8 @@
-
- proxy-maint@gentoo.org
- Proxy Maintainers
+
+ gkroon@maelstrom.ninja
+ Guido Kroon
diff --git a/dev-libs/libcsplit/metadata.xml b/dev-libs/libcsplit/metadata.xml
index 4fa8ff351..1dbf520b5 100644
--- a/dev-libs/libcsplit/metadata.xml
+++ b/dev-libs/libcsplit/metadata.xml
@@ -1,8 +1,8 @@
-
- proxy-maint@gentoo.org
- Proxy Maintainers
+
+ gkroon@maelstrom.ninja
+ Guido Kroon
diff --git a/dev-libs/libcstring/metadata.xml b/dev-libs/libcstring/metadata.xml
index 4fa8ff351..1dbf520b5 100644
--- a/dev-libs/libcstring/metadata.xml
+++ b/dev-libs/libcstring/metadata.xml
@@ -1,8 +1,8 @@
-
- proxy-maint@gentoo.org
- Proxy Maintainers
+
+ gkroon@maelstrom.ninja
+ Guido Kroon
diff --git a/dev-libs/libcsystem/metadata.xml b/dev-libs/libcsystem/metadata.xml
index 4fa8ff351..1dbf520b5 100644
--- a/dev-libs/libcsystem/metadata.xml
+++ b/dev-libs/libcsystem/metadata.xml
@@ -1,8 +1,8 @@
-
- proxy-maint@gentoo.org
- Proxy Maintainers
+
+ gkroon@maelstrom.ninja
+ Guido Kroon
diff --git a/dev-libs/libcthreads/metadata.xml b/dev-libs/libcthreads/metadata.xml
index 4fa8ff351..1dbf520b5 100644
--- a/dev-libs/libcthreads/metadata.xml
+++ b/dev-libs/libcthreads/metadata.xml
@@ -1,8 +1,8 @@
-
- proxy-maint@gentoo.org
- Proxy Maintainers
+
+ gkroon@maelstrom.ninja
+ Guido Kroon
diff --git a/dev-libs/libdwarf/metadata.xml b/dev-libs/libdwarf/metadata.xml
index 4fa8ff351..1dbf520b5 100644
--- a/dev-libs/libdwarf/metadata.xml
+++ b/dev-libs/libdwarf/metadata.xml
@@ -1,8 +1,8 @@
-
- proxy-maint@gentoo.org
- Proxy Maintainers
+
+ gkroon@maelstrom.ninja
+ Guido Kroon
diff --git a/dev-libs/libfcache/metadata.xml b/dev-libs/libfcache/metadata.xml
index 4fa8ff351..1dbf520b5 100644
--- a/dev-libs/libfcache/metadata.xml
+++ b/dev-libs/libfcache/metadata.xml
@@ -1,8 +1,8 @@
-
- proxy-maint@gentoo.org
- Proxy Maintainers
+
+ gkroon@maelstrom.ninja
+ Guido Kroon
diff --git a/dev-libs/libfdata/metadata.xml b/dev-libs/libfdata/metadata.xml
index 4fa8ff351..1dbf520b5 100644
--- a/dev-libs/libfdata/metadata.xml
+++ b/dev-libs/libfdata/metadata.xml
@@ -1,8 +1,8 @@
-
- proxy-maint@gentoo.org
- Proxy Maintainers
+
+ gkroon@maelstrom.ninja
+ Guido Kroon
diff --git a/dev-libs/libfdatetime/metadata.xml b/dev-libs/libfdatetime/metadata.xml
index 4fa8ff351..1dbf520b5 100644
--- a/dev-libs/libfdatetime/metadata.xml
+++ b/dev-libs/libfdatetime/metadata.xml
@@ -1,8 +1,8 @@
-
- proxy-maint@gentoo.org
- Proxy Maintainers
+
+ gkroon@maelstrom.ninja
+ Guido Kroon
diff --git a/dev-libs/libfguid/metadata.xml b/dev-libs/libfguid/metadata.xml
index 4fa8ff351..1dbf520b5 100644
--- a/dev-libs/libfguid/metadata.xml
+++ b/dev-libs/libfguid/metadata.xml
@@ -1,8 +1,8 @@
-
- proxy-maint@gentoo.org
- Proxy Maintainers
+
+ gkroon@maelstrom.ninja
+ Guido Kroon
diff --git a/dev-libs/libfmapi/metadata.xml b/dev-libs/libfmapi/metadata.xml
index 4fa8ff351..1dbf520b5 100644
--- a/dev-libs/libfmapi/metadata.xml
+++ b/dev-libs/libfmapi/metadata.xml
@@ -1,8 +1,8 @@
-
- proxy-maint@gentoo.org
- Proxy Maintainers
+
+ gkroon@maelstrom.ninja
+ Guido Kroon
diff --git a/dev-libs/libfvalue/metadata.xml b/dev-libs/libfvalue/metadata.xml
index 4fa8ff351..1dbf520b5 100644
--- a/dev-libs/libfvalue/metadata.xml
+++ b/dev-libs/libfvalue/metadata.xml
@@ -1,8 +1,8 @@
-
- proxy-maint@gentoo.org
- Proxy Maintainers
+
+ gkroon@maelstrom.ninja
+ Guido Kroon
diff --git a/dev-libs/libfwnt/metadata.xml b/dev-libs/libfwnt/metadata.xml
index 8c3a98f92..46cc27b2b 100644
--- a/dev-libs/libfwnt/metadata.xml
+++ b/dev-libs/libfwnt/metadata.xml
@@ -1,9 +1,9 @@
-
- proxy-maint@gentoo.org
- Proxy Maintainers
+
+ gkroon@maelstrom.ninja
+ Guido Kroon