diff --git a/community/accountsservice/APKBUILD b/community/accountsservice/APKBUILD
index f7b8b82fa0a48e357fa1608c5ec23bd9d8d77887..4a554b86d3287cde68e61ec76fb20405944264ad 100644
--- a/community/accountsservice/APKBUILD
+++ b/community/accountsservice/APKBUILD
@@ -1,4 +1,4 @@
-# Contributor: Carlo Landmeter <clandmeter@gmail.com>
+# Contributor: Carlo Landmeter <clandmeter@alpinelinux.org>
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=accountsservice
 pkgver=0.6.55
diff --git a/community/afpfs-ng/APKBUILD b/community/afpfs-ng/APKBUILD
index 74ad2d5cc0e3bb4d981324c1a66de6e4c60b85a0..d393f83a43112aa851ca76d46d9a8f4ab4263b62 100644
--- a/community/afpfs-ng/APKBUILD
+++ b/community/afpfs-ng/APKBUILD
@@ -1,4 +1,4 @@
-# Contributor: Carlo Landmeter <clandmeter@gmail.com>
+# Contributor: Carlo Landmeter <clandmeter@alpinelinux.org>
 # Maintainer:
 pkgname=afpfs-ng
 pkgver=0.8.1
diff --git a/community/aha/APKBUILD b/community/aha/APKBUILD
index 0b219fc1d00ef5d44be4ea65d1c5dc21cae144f5..705a2e243c1a0895f71420272d3f280971f26ef8 100644
--- a/community/aha/APKBUILD
+++ b/community/aha/APKBUILD
@@ -1,4 +1,4 @@
-# Contributor: Carlo Landmeter <clandmeter@gmail.com>
+# Contributor: Carlo Landmeter <clandmeter@alpinelinux.org>
 # Maintainer: Francesco Colista <fcolista@alpinelinux.org>
 pkgname=aha
 pkgver=0.5.1
diff --git a/community/autossh/APKBUILD b/community/autossh/APKBUILD
index 30dbed38a93247098ccd581a7b7ba793f238241d..38a359bf8821abfb8d4c625652290a8501153637 100644
--- a/community/autossh/APKBUILD
+++ b/community/autossh/APKBUILD
@@ -1,4 +1,4 @@
-# Contributor: Carlo Landmeter <clandmeter@gmail.com>
+# Contributor: Carlo Landmeter <clandmeter@alpinelinux.org>
 # Maintainer: Stuart Cardall <developer@it-offshore.co.uk>
 pkgname=autossh
 pkgver=1.4g
diff --git a/community/beets/APKBUILD b/community/beets/APKBUILD
index 26e2475ed9af731b34dd08faf3e86b50aec22b5e..ea30992053f8b8a9305f77bb223ecc4a745ae75b 100644
--- a/community/beets/APKBUILD
+++ b/community/beets/APKBUILD
@@ -1,5 +1,5 @@
 # Contributor: Łukasz Jendrysik <scadu@yandex.com>
-# Contributor: Carlo Landmeter <clandmeter@gmail.com>
+# Contributor: Carlo Landmeter <clandmeter@alpinelinux.org>
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=beets
 pkgver=1.4.9
diff --git a/community/certbot/APKBUILD b/community/certbot/APKBUILD
index 652f1e1a869ecdb1bd966d126a209a3195a7c68b..0d4eaeada3a02c68956b03ce7ae2dbb2c9852245 100644
--- a/community/certbot/APKBUILD
+++ b/community/certbot/APKBUILD
@@ -1,4 +1,4 @@
-# Contributor: Carlo Landmeter <clandmeter@gmail.com>
+# Contributor: Carlo Landmeter <clandmeter@alpinelinux.org>
 # Maintainer: Francesco Colista <fcolista@alpinelinux.org>
 pkgname=certbot
 pkgver=1.11.0
diff --git a/community/cgmanager/APKBUILD b/community/cgmanager/APKBUILD
index 686f891a32b2944703d81f3e13a014121ae4157a..ab4d9219c3859bed006c2e212cfa7c07a3e82c83 100644
--- a/community/cgmanager/APKBUILD
+++ b/community/cgmanager/APKBUILD
@@ -1,4 +1,4 @@
-# Contributor: Carlo Landmeter <clandmeter@gmail.com>
+# Contributor: Carlo Landmeter <clandmeter@alpinelinux.org>
 # Maintainer: Francesco Colista <fcolista@alpinelinux.org>
 pkgname=cgmanager
 pkgver=0.42
diff --git a/community/chromium/APKBUILD b/community/chromium/APKBUILD
index c6342f5d99909c84badf0d49d6ea7a557e6f8f35..833a9195c1cbb367e49e75b58e248a2e841ea271 100644
--- a/community/chromium/APKBUILD
+++ b/community/chromium/APKBUILD
@@ -1,4 +1,4 @@
-# Contributor: Carlo Landmeter <clandmeter@gmail.com>
+# Contributor: Carlo Landmeter <clandmeter@alpinelinux.org>
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=chromium
 pkgver=86.0.4240.111
diff --git a/community/clamsmtp/APKBUILD b/community/clamsmtp/APKBUILD
index 8491eef877e3dbea211f9d65ba18e41062f3470e..33f8649a5c3f8d46409a3b2664858097f110e528 100644
--- a/community/clamsmtp/APKBUILD
+++ b/community/clamsmtp/APKBUILD
@@ -1,8 +1,8 @@
-# Contributor: Carlo Landmeter <clandmeter@gmail.com>
-# Maintainer: Carlo Landmeter <clandmeter@gmail.com>
+# Contributor: Carlo Landmeter <clandmeter@alpinelinux.org>
+# Maintainer: Carlo Landmeter <clandmeter@alpinelinux.org>
 pkgname=clamsmtp
 pkgver=1.10
-pkgrel=17
+pkgrel=18
 pkgdesc="An SMTP Virus Filter"
 url="http://thewalter.net/stef/software/clamsmtp/"
 arch="all !s390x"
diff --git a/community/clisp/APKBUILD b/community/clisp/APKBUILD
index 92c1ba6d1a5fcb379c265c61593562d288fbbd17..84a2a6ce65c186df631bda3f215196878321df29 100644
--- a/community/clisp/APKBUILD
+++ b/community/clisp/APKBUILD
@@ -1,5 +1,5 @@
 # Contributor: Sören Tempel <soeren+alpine@soeren-tempel.net>
-# Contributor: Carlo Landmeter <clandmeter@gmail.com>
+# Contributor: Carlo Landmeter <clandmeter@alpinelinux.org>
 # Maintainer: Will Sinatra <wpsinatra@gmail.com>
 pkgname=clisp
 pkgver=2.49
diff --git a/community/cogl/APKBUILD b/community/cogl/APKBUILD
index 93c67546c6e1c308c0a6ee5b4982ca4effeb6775..f24dc4d2e93ad53d438f9179785cf0da5601080e 100644
--- a/community/cogl/APKBUILD
+++ b/community/cogl/APKBUILD
@@ -1,5 +1,5 @@
 # Contributor: Rasmus Thomsen <oss@cogitri.dev>
-# Contributor: Carlo Landmeter <clandmeter@gmail.com>
+# Contributor: Carlo Landmeter <clandmeter@alpinelinux.org>
 # Contributor: Natanael Copa <ncopa@alpinelinux.org>
 # Maintainer: Rasmus Thomsen <oss@cogitri.dev>
 pkgname=cogl
diff --git a/community/colord/APKBUILD b/community/colord/APKBUILD
index c286cc1993e9ee42817695940d182100cdf73d7a..306571905c39e54786b5247e70deb664355a0bb2 100644
--- a/community/colord/APKBUILD
+++ b/community/colord/APKBUILD
@@ -1,4 +1,4 @@
-# Contributor: Carlo Landmeter <clandmeter@gmail.com>
+# Contributor: Carlo Landmeter <clandmeter@alpinelinux.org>
 # Contributor: Rasmus Thomsen <oss@cogitri.dev>
 # Maintainer: Kevin Daudt <kdaudt@alpinelinux.org>
 pkgname=colord
diff --git a/community/domoticz/APKBUILD b/community/domoticz/APKBUILD
index 68e095aeb3ac6ac00e61bffc711335b38a27ec05..7393e622c212746d527d13bb487438144d7b5619 100644
--- a/community/domoticz/APKBUILD
+++ b/community/domoticz/APKBUILD
@@ -1,8 +1,8 @@
-# Contributor: Carlo Landmeter <clandmeter@gmail.com>
-# Maintainer: Carlo Landmeter <clandmeter@gmail.com>
+# Contributor: Carlo Landmeter <clandmeter@alpinelinux.org>
+# Maintainer: Carlo Landmeter <clandmeter@alpinelinux.org>
 pkgname=domoticz
 pkgver=4.10717
-pkgrel=4
+pkgrel=5
 pkgdesc="Open source Home Automation System"
 url="http://www.domoticz.com/"
 arch="all"
diff --git a/community/drupal7/APKBUILD b/community/drupal7/APKBUILD
index 64f9a39c9c5ed0675e5ec01bf9225920339ef800..beeec201b1706c0443aa8ac009e3ccff320981b2 100644
--- a/community/drupal7/APKBUILD
+++ b/community/drupal7/APKBUILD
@@ -1,4 +1,4 @@
-# Contributor: Carlo Landmeter <clandmeter@gmail.com>
+# Contributor: Carlo Landmeter <clandmeter@alpinelinux.org>
 # Maintainer: Andy Postnikov <apostnikov@gmail.com>
 pkgname=drupal7
 pkgver=7.77
diff --git a/community/duply/APKBUILD b/community/duply/APKBUILD
index b3a5dc6b42830e41476543f5826f0bdd42c0b3ec..30bbdd07952f136fda5e282407700c9da6836aa9 100644
--- a/community/duply/APKBUILD
+++ b/community/duply/APKBUILD
@@ -1,5 +1,5 @@
 # Contributor: Łukasz Jendrysik <scadu@yandex.com>
-# Contributor: Carlo Landmeter <clandmeter@gmail.com>
+# Contributor: Carlo Landmeter <clandmeter@alpinelinux.org>
 # Maintainer: Francesco Colista <fcolista@alpinelinux.org>
 pkgname=duply
 pkgver=2.3
diff --git a/community/easypki/APKBUILD b/community/easypki/APKBUILD
index faf67f71d146526a2d7271dd86648c56e1a0db84..36b462daadfb93a703aed27096bdbb686e897984 100644
--- a/community/easypki/APKBUILD
+++ b/community/easypki/APKBUILD
@@ -1,8 +1,8 @@
-# Contributor: Carlo Landmeter <clandmeter@gmail.com>
-# Maintainer: Carlo Landmeter <clandmeter@gmail.com>
+# Contributor: Carlo Landmeter <clandmeter@alpinelinux.org>
+# Maintainer: Carlo Landmeter <clandmeter@alpinelinux.org>
 pkgname=easypki
 pkgver=1.1.0
-pkgrel=3
+pkgrel=4
 pkgdesc="Creating a certificate authority the easy way"
 url="https://github.com/google/easypki"
 arch="all !mips !mips64"
diff --git a/community/fdk-aac/APKBUILD b/community/fdk-aac/APKBUILD
index d9ff727146631d021d968e0affbde83d3c9d8a88..935cc89e4b49a44a41eb9b05c7954f15d0fd3f44 100644
--- a/community/fdk-aac/APKBUILD
+++ b/community/fdk-aac/APKBUILD
@@ -1,4 +1,4 @@
-# Contributor: Carlo Landmeter <clandmeter@gmail.com>
+# Contributor: Carlo Landmeter <clandmeter@alpinelinux.org>
 # Maintainer:
 pkgname=fdk-aac
 pkgver=2.0.1
diff --git a/community/fdupes/APKBUILD b/community/fdupes/APKBUILD
index bbaa7fb1fb0d93ee99f69cea2ebca84c99c63a07..b79106ad85796684cbd4914eaa743274f5b8a500 100644
--- a/community/fdupes/APKBUILD
+++ b/community/fdupes/APKBUILD
@@ -1,4 +1,4 @@
-# Contributor: Carlo Landmeter <clandmeter@gmail.com>
+# Contributor: Carlo Landmeter <clandmeter@alpinelinux.org>
 # Maintainer:
 pkgname=fdupes
 pkgver=2.1.2
diff --git a/community/ffcall/APKBUILD b/community/ffcall/APKBUILD
index 1f6785ac3126f4474561949e2741a0e9bc370f70..2944ec6a8e660e415bbe66e33f259c57acf1d2c0 100644
--- a/community/ffcall/APKBUILD
+++ b/community/ffcall/APKBUILD
@@ -1,4 +1,4 @@
-# Contributor: Carlo Landmeter <clandmeter@gmail.com>
+# Contributor: Carlo Landmeter <clandmeter@alpinelinux.org>
 # Maintainer: Will Sinatra <wpsinatra@gmail.com>
 pkgname=ffcall
 pkgver=2.2
diff --git a/community/font-noto-cjk/APKBUILD b/community/font-noto-cjk/APKBUILD
index 818b584bf515b9468f87073b6cf138eea5f400ff..a9ba0bfa42659ebc708809d03422147f0b2b92a8 100644
--- a/community/font-noto-cjk/APKBUILD
+++ b/community/font-noto-cjk/APKBUILD
@@ -1,4 +1,4 @@
-# Contributor: Carlo Landmeter <clandmeter@gmail.com>
+# Contributor: Carlo Landmeter <clandmeter@alpinelinux.org>
 # Maintainer: Drew DeVault <sir@cmpwn.com>
 pkgname=font-noto-cjk
 pkgver=0_git20181130
diff --git a/community/font-noto/APKBUILD b/community/font-noto/APKBUILD
index c06e15027cd619e7b2ee85a627737378f7b54240..7cfb0b01a2418be898cd594115fe178bfff5719c 100644
--- a/community/font-noto/APKBUILD
+++ b/community/font-noto/APKBUILD
@@ -1,9 +1,9 @@
-# Contributor: Carlo Landmeter <clandmeter@gmail.com>
-# Maintainer: Carlo Landmeter <clandmeter@gmail.com>
+# Contributor: Carlo Landmeter <clandmeter@alpinelinux.org>
+# Maintainer: Carlo Landmeter <clandmeter@alpinelinux.org>
 pkgname=font-noto
 pkgver=0_git20190623
 _commit=462ad2d2a45df33785980f9d9f56f6369cfc110d
-pkgrel=1
+pkgrel=2
 pkgdesc="Google's font family that aims to support all the world's languages"
 url="https://github.com/googlei18n/noto-fonts/"
 arch="noarch"
diff --git a/community/font-overpass/APKBUILD b/community/font-overpass/APKBUILD
index c7f088d4e7a47c43cad3937e8c271bd7648a46c9..d8efefba07fa68ab5057794ca1a0653dc02263c4 100644
--- a/community/font-overpass/APKBUILD
+++ b/community/font-overpass/APKBUILD
@@ -1,4 +1,4 @@
-# Contributor: Carlo Landmeter <clandmeter@gmail.com>
+# Contributor: Carlo Landmeter <clandmeter@alpinelinux.org>
 # Maintainer: Sascha Paunovic <azarus@posteo.net>
 pkgname=font-overpass
 pkgver=3.0.4
diff --git a/community/frei0r-plugins/APKBUILD b/community/frei0r-plugins/APKBUILD
index 773721d94620edfb8edc8bbcabad1cb5408e7ab8..c2d48f4156562f64a46b2705a5b1442f816f9e78 100644
--- a/community/frei0r-plugins/APKBUILD
+++ b/community/frei0r-plugins/APKBUILD
@@ -1,4 +1,4 @@
-# Contributor: Carlo Landmeter <clandmeter@gmail.com>
+# Contributor: Carlo Landmeter <clandmeter@alpinelinux.org>
 # Maintainer: Bart Ribbers <bribbers@disroot.org>
 pkgname=frei0r-plugins
 pkgver=1.7.0
diff --git a/community/gavl/APKBUILD b/community/gavl/APKBUILD
index 7d4a6dded3f5f16ec3dcd50f130f8d8de9b32dae..497a42f43aae9ab79ecd22f9856df00ea1fe5079 100644
--- a/community/gavl/APKBUILD
+++ b/community/gavl/APKBUILD
@@ -1,4 +1,4 @@
-# Contributor: Carlo Landmeter <clandmeter@gmail.com>
+# Contributor: Carlo Landmeter <clandmeter@alpinelinux.org>
 # Maintainer: Bart Ribbers <bribbers@disroot.org>
 pkgname=gavl
 pkgver=1.4.0
diff --git a/community/gitea/APKBUILD b/community/gitea/APKBUILD
index aad2ac223430b2ce7b214fb1287746371f8aee44..4587c87df32435a5fb389b1a94d3631f913f504c 100644
--- a/community/gitea/APKBUILD
+++ b/community/gitea/APKBUILD
@@ -1,4 +1,4 @@
-# Contributor: Carlo Landmeter <clandmeter@gmail.com>
+# Contributor: Carlo Landmeter <clandmeter@alpinelinux.org>
 # Contributor: 6543 <6543@obermui.de>
 # Maintainer: 6543 <6543@obermui.de>
 pkgname=gitea
diff --git a/community/gnome-common/APKBUILD b/community/gnome-common/APKBUILD
index c156fbb1ecc65c00acd8eed394b32d25529d76a8..01bf501f22f96421adf954c6a9e9b3a80f32776f 100644
--- a/community/gnome-common/APKBUILD
+++ b/community/gnome-common/APKBUILD
@@ -1,4 +1,4 @@
-# Contributor: Carlo Landmeter <clandmeter@gmail.com>
+# Contributor: Carlo Landmeter <clandmeter@alpinelinux.org>
 # Maintainer: Francesco Colista <fcolista@alpinelinux.org>
 pkgname=gnome-common
 pkgver=3.18.0
diff --git a/community/go-bindata/APKBUILD b/community/go-bindata/APKBUILD
index 6f3f1874f716df22786cb3e4670164d204070591..ecf6bc232407ae54ca2869c7d5fb6493a4ce176b 100644
--- a/community/go-bindata/APKBUILD
+++ b/community/go-bindata/APKBUILD
@@ -1,4 +1,4 @@
-# Contributor: Carlo Landmeter <clandmeter@gmail.com>
+# Contributor: Carlo Landmeter <clandmeter@alpinelinux.org>
 # Maintainer: Kevin Daudt <kdaudt@alpinelinux.org>
 pkgname=go-bindata
 pkgver=20151023
diff --git a/community/godep/APKBUILD b/community/godep/APKBUILD
index 522a467e280143f56a6fae7713cc873519e12178..87244673215e5bef402886c62ca60838ce7cf8cd 100644
--- a/community/godep/APKBUILD
+++ b/community/godep/APKBUILD
@@ -1,4 +1,4 @@
-# Contributor: Carlo Landmeter <clandmeter@gmail.com>
+# Contributor: Carlo Landmeter <clandmeter@alpinelinux.org>
 # Maintainer: Roberto Oliveira <robertoguimaraes8@gmail.com>
 pkgname=godep
 pkgver=80
diff --git a/community/gogs/APKBUILD b/community/gogs/APKBUILD
index 77642cc40e952df6a867216ec878a519383cb0d8..d7f37334c6bb15ddc0c057390e52280bc3ac9f0e 100644
--- a/community/gogs/APKBUILD
+++ b/community/gogs/APKBUILD
@@ -1,4 +1,4 @@
-# Contributor: Carlo Landmeter <clandmeter@gmail.com>
+# Contributor: Carlo Landmeter <clandmeter@alpinelinux.org>
 # Contributor: 7heo <7heo@mail.com>
 # Maintainer:
 pkgname=gogs
diff --git a/community/govendor/APKBUILD b/community/govendor/APKBUILD
index 7ff4bf9356b2bcd8cbb6830865d22702e5a2e9ad..fb767583062845cbcc115b300802265e8069a7f8 100644
--- a/community/govendor/APKBUILD
+++ b/community/govendor/APKBUILD
@@ -1,8 +1,8 @@
-# Contributor: Carlo Landmeter <clandmeter@gmail.com>
-# Maintainer: Carlo Landmeter <clandmeter@gmail.com>
+# Contributor: Carlo Landmeter <clandmeter@alpinelinux.org>
+# Maintainer: Carlo Landmeter <clandmeter@alpinelinux.org>
 pkgname=govendor
 pkgver=1.0.9
-pkgrel=3
+pkgrel=4
 pkgdesc="Go vendor tool that works with the standard vendor file"
 url="https://github.com/kardianos/govendor"
 arch="all !mips !mips64"
diff --git a/community/graphicsmagick/APKBUILD b/community/graphicsmagick/APKBUILD
index aa7acc8ba6967e951bc39207fb4f9a83e5487378..6318a971bcf8032fbcac1ed8a7419ad1718eb0bd 100644
--- a/community/graphicsmagick/APKBUILD
+++ b/community/graphicsmagick/APKBUILD
@@ -1,4 +1,4 @@
-# Contributor: Carlo Landmeter <clandmeter@gmail.com>
+# Contributor: Carlo Landmeter <clandmeter@alpinelinux.org>
 # Maintainer: Francesco Colista <fcolista@alpinelinux.org>
 pkgname=graphicsmagick
 pkgver=1.3.36
diff --git a/community/gtkspell3/APKBUILD b/community/gtkspell3/APKBUILD
index 8310fc399402914fef65ef5a0b4e63b2a76541c0..09a85a0a60d3d8236a3546588323317c462934df 100644
--- a/community/gtkspell3/APKBUILD
+++ b/community/gtkspell3/APKBUILD
@@ -1,4 +1,4 @@
-# Contributor: Carlo Landmeter <clandmeter@gmail.com>
+# Contributor: Carlo Landmeter <clandmeter@alpinelinux.org>
 # Maintainer: Rasmus Thomsen <oss@cogitri.dev>
 pkgname=gtkspell3
 pkgver=3.0.10
diff --git a/community/imagemagick/APKBUILD b/community/imagemagick/APKBUILD
index 8101cd79903cf799e66cdc9ac82f8d1730f75773..8e50fad86c3623bdffb6622ed589a0f93d649582 100644
--- a/community/imagemagick/APKBUILD
+++ b/community/imagemagick/APKBUILD
@@ -1,5 +1,5 @@
 # Contributor: Łukasz Jendrysik <scadu@yandex.com>
-# Contributor: Carlo Landmeter <clandmeter@gmail.com>
+# Contributor: Carlo Landmeter <clandmeter@alpinelinux.org>
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=imagemagick
 _pkgname=ImageMagick
diff --git a/community/imagemagick6/APKBUILD b/community/imagemagick6/APKBUILD
index e4228a4ab3b8449b2fa08ba72ca0c73feaec296e..8cf8b1d639e0df81e613f8b77747f8330e6e923f 100644
--- a/community/imagemagick6/APKBUILD
+++ b/community/imagemagick6/APKBUILD
@@ -1,5 +1,5 @@
 # Contributor: Łukasz Jendrysik <scadu@yandex.com>
-# Contributor: Carlo Landmeter <clandmeter@gmail.com>
+# Contributor: Carlo Landmeter <clandmeter@alpinelinux.org>
 # Maintainer: Jakub Jirutka <jakub@jirutka.cz>
 pkgname=imagemagick6
 _pkgname=ImageMagick6
diff --git a/community/ipmitool/APKBUILD b/community/ipmitool/APKBUILD
index 4a95647d3cde4b1091ff038886eb6575acef653a..8049833d12ae7b6d3773593b9fcdbb07a8abac5d 100644
--- a/community/ipmitool/APKBUILD
+++ b/community/ipmitool/APKBUILD
@@ -1,4 +1,4 @@
-# Contributor: Carlo Landmeter <clandmeter@gmail.com>
+# Contributor: Carlo Landmeter <clandmeter@alpinelinux.org>
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=ipmitool
 _pkgname=IPMITOOL
diff --git a/community/jreen/APKBUILD b/community/jreen/APKBUILD
index 9bf8f3bff2269695c837c1989042f9f28928b66c..17de168da33520470af86a753f02dc05a27d2d99 100644
--- a/community/jreen/APKBUILD
+++ b/community/jreen/APKBUILD
@@ -1,4 +1,4 @@
-# Contributor: Carlo Landmeter <clandmeter@gmail.com>
+# Contributor: Carlo Landmeter <clandmeter@alpinelinux.org>
 # Maintainer: Francesco Colista <fcolista@alpinelinux.org>
 pkgname=jreen
 pkgver=1.3.0
diff --git a/community/kodi/APKBUILD b/community/kodi/APKBUILD
index de2ccf825780e1674d5cc6d074ea201d07fcdee1..26d9fc3fc721e586edf65fa0e74cec35b1f26ba6 100644
--- a/community/kodi/APKBUILD
+++ b/community/kodi/APKBUILD
@@ -1,4 +1,4 @@
-# Contributor: Carlo Landmeter <clandmeter@gmail.com>
+# Contributor: Carlo Landmeter <clandmeter@alpinelinux.org>
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=kodi
 pkgver=18.9
diff --git a/community/ladspa/APKBUILD b/community/ladspa/APKBUILD
index 7d9604531619044102616d6a9efe2e7e8db8e289..49091d0bb69907f40ba9ae7f19dd3be939b0f6ba 100644
--- a/community/ladspa/APKBUILD
+++ b/community/ladspa/APKBUILD
@@ -1,4 +1,4 @@
-# Contributor: Carlo Landmeter <clandmeter@gmail.com>
+# Contributor: Carlo Landmeter <clandmeter@alpinelinux.org>
 # Maintainer: David Demelier <markand@malikania.fr>
 pkgname=ladspa
 pkgver=1.15
diff --git a/community/leptonica/APKBUILD b/community/leptonica/APKBUILD
index 24d44939342a47fe7135522a6857ea99537d011f..3f64e314633fbc1372e5600f9c13e6a76081b3b3 100644
--- a/community/leptonica/APKBUILD
+++ b/community/leptonica/APKBUILD
@@ -1,4 +1,4 @@
-# Contributor: Carlo Landmeter <clandmeter@gmail.com>
+# Contributor: Carlo Landmeter <clandmeter@alpinelinux.org>
 # Maintainer: Francesco Colista <fcolista@alpinelinux.org>
 pkgname=leptonica
 pkgver=1.80.0
diff --git a/community/libass/APKBUILD b/community/libass/APKBUILD
index 3861157bc4119e42f6c0ad4195b59f1256e982eb..e71c3fd74b98b84cd50a8dfb0167ced15eb35640 100644
--- a/community/libass/APKBUILD
+++ b/community/libass/APKBUILD
@@ -1,5 +1,5 @@
 # Contributor: Łukasz Jendrysik <scadu@yandex.com>
-# Contributor: Carlo Landmeter <clandmeter@gmail.com>
+# Contributor: Carlo Landmeter <clandmeter@alpinelinux.org>
 # Contributor: Sören Tempel <soeren+alpine@soeren-tempel.net>
 # Contributor: Jakub Skrzypnik <j.skrzypnik@openmailbox.org>
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
diff --git a/community/libcrystalhd/APKBUILD b/community/libcrystalhd/APKBUILD
index 5bf3b481d84a9a321cb319c5c01529b3f1df7968..3420a217ce12e06b57331c2ea463fb2f333232a3 100644
--- a/community/libcrystalhd/APKBUILD
+++ b/community/libcrystalhd/APKBUILD
@@ -1,4 +1,4 @@
-# Contributor: Carlo Landmeter <clandmeter@gmail.com>
+# Contributor: Carlo Landmeter <clandmeter@alpinelinux.org>
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=libcrystalhd
 pkgver=20130708
diff --git a/community/libdvbcsa/APKBUILD b/community/libdvbcsa/APKBUILD
index a6dd2bfe131c058b65be2d6b8d6cc949bfc768df..63daeaee6edf9f385ff2cc28984f5c3d6b1004f1 100644
--- a/community/libdvbcsa/APKBUILD
+++ b/community/libdvbcsa/APKBUILD
@@ -1,4 +1,4 @@
-# Contributor: Carlo Landmeter <clandmeter@gmail.com>
+# Contributor: Carlo Landmeter <clandmeter@alpinelinux.org>
 # Maintainer: Roberto Oliveira <robertoguimaraes8@gmail.com>
 pkgname=libdvbcsa
 pkgver=1.1.0
diff --git a/community/libgusb/APKBUILD b/community/libgusb/APKBUILD
index fb27874a6a0170419dad1d36e8a723938372426e..5ba2b0d97aa2ae55bce0a123e5148696fad78ebd 100644
--- a/community/libgusb/APKBUILD
+++ b/community/libgusb/APKBUILD
@@ -1,4 +1,4 @@
-# Contributor: Carlo Landmeter <clandmeter@gmail.com>
+# Contributor: Carlo Landmeter <clandmeter@alpinelinux.org>
 # Maintainer: Francesco Colista <fcolista@alpinelinux.org>
 pkgname=libgusb
 pkgver=0.3.5
diff --git a/community/libmcrypt/APKBUILD b/community/libmcrypt/APKBUILD
index 9de9c07fb37f37e2ee908708f268fb0bd95f07d1..9b81e3a32ffeff0860ebde341c47e9e4f8c5ef9b 100644
--- a/community/libmcrypt/APKBUILD
+++ b/community/libmcrypt/APKBUILD
@@ -1,7 +1,7 @@
-# Maintainer: Carlo Landmeter <clandmeter@gmail.com>
+# Maintainer: Carlo Landmeter <clandmeter@alpinelinux.org>
 pkgname=libmcrypt
 pkgver=2.5.8
-pkgrel=8
+pkgrel=9
 pkgdesc="A library which provides a uniform interface to several symmetric encryption algorithms"
 url="http://mcrypt.sourceforge.net/"
 arch="all"
diff --git a/community/libmediainfo/APKBUILD b/community/libmediainfo/APKBUILD
index 3e79cf8362ca1dda18927c29c83e0fa775a3d838..e95857fb39c116ea5547828ba28321d0cee740c8 100644
--- a/community/libmediainfo/APKBUILD
+++ b/community/libmediainfo/APKBUILD
@@ -1,4 +1,4 @@
-# Contributor: Carlo Landmeter <clandmeter@gmail.com>
+# Contributor: Carlo Landmeter <clandmeter@alpinelinux.org>
 # Maintainer: Corey Oliver <corey.jon.oliver@gmail.com>
 
 # Bundled libraries used in the package:
diff --git a/community/libmicrohttpd/APKBUILD b/community/libmicrohttpd/APKBUILD
index f56a6b87b765c3da8772de52b04ffe41797aa645..7daabc3ff995d78c61690d0b31fda70702d42f76 100644
--- a/community/libmicrohttpd/APKBUILD
+++ b/community/libmicrohttpd/APKBUILD
@@ -1,6 +1,6 @@
 # Contributor: Leo <thinkabit.ukim@gmail.com>
 # Contributor: Łukasz Jendrysik <scadu@yandex.com>
-# Contributor: Carlo Landmeter <clandmeter@gmail.com>
+# Contributor: Carlo Landmeter <clandmeter@alpinelinux.org>
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=libmicrohttpd
 pkgver=0.9.72
diff --git a/community/libnfs/APKBUILD b/community/libnfs/APKBUILD
index f87dd5bb594ae310b21bd9493cf9f0ef0491983c..6b5eb8d31142c6ba0ecafd5ab99766619fef8745 100644
--- a/community/libnfs/APKBUILD
+++ b/community/libnfs/APKBUILD
@@ -1,4 +1,4 @@
-# Contributor: Carlo Landmeter <clandmeter@gmail.com>
+# Contributor: Carlo Landmeter <clandmeter@alpinelinux.org>
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=libnfs
 pkgver=4.0.0
diff --git a/community/libshairport/APKBUILD b/community/libshairport/APKBUILD
index fefe337b6d46462568d626c6688606de3d511327..0a1e465a28eab1338525015955e23210c07575e4 100644
--- a/community/libshairport/APKBUILD
+++ b/community/libshairport/APKBUILD
@@ -1,4 +1,4 @@
-# Contributor: Carlo Landmeter <clandmeter@gmail.com>
+# Contributor: Carlo Landmeter <clandmeter@alpinelinux.org>
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=libshairport
 pkgver=1.2.1.20121215
diff --git a/community/libsigsegv/APKBUILD b/community/libsigsegv/APKBUILD
index a5b345ae53f200958f7bd2c3bcf90cc3e7960f4b..c83ea99513b361b5ca8076cd1f7dff5da75a40d4 100644
--- a/community/libsigsegv/APKBUILD
+++ b/community/libsigsegv/APKBUILD
@@ -1,4 +1,4 @@
-# Contributor: Carlo Landmeter <clandmeter@gmail.com>
+# Contributor: Carlo Landmeter <clandmeter@alpinelinux.org>
 # Maintainer: Will Sinatra <wpsinatra@gmail.com>
 pkgname=libsigsegv
 pkgver=2.12
diff --git a/community/libssh/APKBUILD b/community/libssh/APKBUILD
index 18cd61bf649b859d26cb7b3850f12ee256033b00..03013f91da64ece428c2e6672a718c5f626489ac 100644
--- a/community/libssh/APKBUILD
+++ b/community/libssh/APKBUILD
@@ -1,4 +1,4 @@
-# Contributor: Carlo Landmeter <clandmeter@gmail.com>
+# Contributor: Carlo Landmeter <clandmeter@alpinelinux.org>
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=libssh
 pkgver=0.9.5
diff --git a/community/libva-intel-driver/APKBUILD b/community/libva-intel-driver/APKBUILD
index 1011fc76d349ec1881d588f20b36242ebcfbc84a..f9b9b42aae4ae46f90c2e9fc739f661186410242 100644
--- a/community/libva-intel-driver/APKBUILD
+++ b/community/libva-intel-driver/APKBUILD
@@ -1,4 +1,4 @@
-# Contributor: Carlo Landmeter <clandmeter@gmail.com>
+# Contributor: Carlo Landmeter <clandmeter@alpinelinux.org>
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=libva-intel-driver
 pkgver=2.4.1
diff --git a/community/libzen/APKBUILD b/community/libzen/APKBUILD
index 0082e190be493ac777933edb8aebce6bc355a001..4917f9150d35af3a418e5a6263a495f511358e1e 100644
--- a/community/libzen/APKBUILD
+++ b/community/libzen/APKBUILD
@@ -1,5 +1,5 @@
 # Contributor: Leo <thinkabit.ukim@gmail.com>
-# Contributor: Carlo Landmeter <clandmeter@gmail.com>
+# Contributor: Carlo Landmeter <clandmeter@alpinelinux.org>
 # Maintainer: Corey Oliver <corey.jon.oliver@gmail.com>
 pkgname=libzen
 pkgver=0.4.38
diff --git a/community/libzip/APKBUILD b/community/libzip/APKBUILD
index 4cdbf030893de7acb4b94902777abe419ebe59f4..d433fc658c375a7e46fc15b4ed776991d7b8cd97 100644
--- a/community/libzip/APKBUILD
+++ b/community/libzip/APKBUILD
@@ -1,9 +1,9 @@
 # Contributor: k0r10n <k0r10n.dev@gmail.com>
 # Contributor: Jose-Luis Rivas <ghostbar@riseup.net>
-# Maintainer: Carlo Landmeter <clandmeter@gmail.com>
+# Maintainer: Carlo Landmeter <clandmeter@alpinelinux.org>
 pkgname=libzip
 pkgver=1.7.3
-pkgrel=1
+pkgrel=2
 pkgdesc="C library for manipulating zip archives"
 url="http://www.nih.at/libzip/index.html"
 arch="all"
diff --git a/community/linux-tools/APKBUILD b/community/linux-tools/APKBUILD
index 5879e98c1b5874c672459f66a568b09e4841c599..c5bf9215d979e20b2f2b9407a0bca326ad69b32e 100644
--- a/community/linux-tools/APKBUILD
+++ b/community/linux-tools/APKBUILD
@@ -1,5 +1,5 @@
 # Contributor: Leo <thinkabit.ukim@gmail.com>
-# Contributor: Carlo Landmeter <clandmeter@gmail.com>
+# Contributor: Carlo Landmeter <clandmeter@alpinelinux.org>
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=linux-tools
 pkgver=5.10.4
diff --git a/community/lockdev/APKBUILD b/community/lockdev/APKBUILD
index 9165bc91df9aa9685ca3e64cb63ccf7e81d8f51e..44a4dbef0db7d8a30a197d0263809e36e94598f7 100644
--- a/community/lockdev/APKBUILD
+++ b/community/lockdev/APKBUILD
@@ -1,4 +1,4 @@
-# Contributor: Carlo Landmeter <clandmeter@gmail.com>
+# Contributor: Carlo Landmeter <clandmeter@alpinelinux.org>
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=lockdev
 pkgver=0_git20130107
diff --git a/community/lua-lpeg/APKBUILD b/community/lua-lpeg/APKBUILD
index 6c020232136a7413d103453d962259e7a81c9819..2e62dbb40b8cf7696fd09bab9063e7ba112040dc 100644
--- a/community/lua-lpeg/APKBUILD
+++ b/community/lua-lpeg/APKBUILD
@@ -1,4 +1,4 @@
-# Contributor: Carlo Landmeter <clandmeter@gmail.com>
+# Contributor: Carlo Landmeter <clandmeter@alpinelinux.org>
 # Maintainer: Jakub Jirutka <jakub@jirutka.cz>
 pkgname=lua-lpeg
 _pkgname=lpeg
diff --git a/community/lua-turbo/APKBUILD b/community/lua-turbo/APKBUILD
index 7d6d09f80f05c72e30d6315d72b17f5496b09943..5eb4c047fb36d50e9f6497224da2398b221e9678 100644
--- a/community/lua-turbo/APKBUILD
+++ b/community/lua-turbo/APKBUILD
@@ -1,9 +1,8 @@
-# Contributor: Carlo Landmeter <clandmeter@gmail.com>
-# Maintainer: Carlo Landmeter <clandmeter@gmail.com>
-
+# Contributor: Carlo Landmeter <clandmeter@alpinelinux.org>
+# Maintainer: Carlo Landmeter <clandmeter@alpinelinux.org>
 pkgname=lua-turbo
 pkgver=2.1.3
-pkgrel=5
+pkgrel=6
 pkgdesc="framework built for LuaJIT 2 and Linux"
 url="https://github.com/kernelsauce/turbo"
 arch="all"
diff --git a/community/luarocks/APKBUILD b/community/luarocks/APKBUILD
index 707be668380b47299c1fd1743d4130ef9dae4b64..786962261e56cb83ec4788a8644f35222d69f846 100644
--- a/community/luarocks/APKBUILD
+++ b/community/luarocks/APKBUILD
@@ -1,4 +1,4 @@
-# Contributor: Carlo Landmeter <clandmeter@gmail.com>
+# Contributor: Carlo Landmeter <clandmeter@alpinelinux.org>
 # Maintainer: Jakub Jirutka <jakub@jirutka.cz>
 pkgname=luarocks
 pkgver=2.4.4
diff --git a/community/lucene++/APKBUILD b/community/lucene++/APKBUILD
index c28540f4ff20a96a5e22b0d5c6c65a0fba7afafa..478cefdabfe41a92e404391f705b31d7a345f131 100644
--- a/community/lucene++/APKBUILD
+++ b/community/lucene++/APKBUILD
@@ -1,4 +1,4 @@
-# Contributor: Carlo Landmeter <clandmeter@gmail.com>
+# Contributor: Carlo Landmeter <clandmeter@alpinelinux.org>
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=lucene++
 pkgver=3.0.7
diff --git a/community/lxcfs/APKBUILD b/community/lxcfs/APKBUILD
index ad73e63a5ea1d59cb8e88b60e95094a5c0470a70..03c7c4759a664eb6641cd0e69c8d346bc3611c03 100644
--- a/community/lxcfs/APKBUILD
+++ b/community/lxcfs/APKBUILD
@@ -1,4 +1,4 @@
-# Contributor: Carlo Landmeter <clandmeter@gmail.com>
+# Contributor: Carlo Landmeter <clandmeter@alpinelinux.org>
 # Maintainer: Stuart Cardall <developer@it-offshore.co.uk>
 pkgname=lxcfs
 pkgver=4.0.6
diff --git a/community/mesa-demos/APKBUILD b/community/mesa-demos/APKBUILD
index 2fa72cad19583f15a80afbfd8d79a4143dda7005..d6ba441c5bd941bc8fa7f1c81b1b8168535b61ed 100644
--- a/community/mesa-demos/APKBUILD
+++ b/community/mesa-demos/APKBUILD
@@ -1,4 +1,4 @@
-# Contributor: Carlo Landmeter <clandmeter@gmail.com>
+# Contributor: Carlo Landmeter <clandmeter@alpinelinux.org>
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=mesa-demos
 pkgver=8.4.0
diff --git a/community/micro/APKBUILD b/community/micro/APKBUILD
index 2c6ae319a3a2ffcdcea751aa9442f3876340de4b..55106a0184a955917ffa25631f26080fa4f2b660 100644
--- a/community/micro/APKBUILD
+++ b/community/micro/APKBUILD
@@ -1,4 +1,4 @@
-# Contributor: Carlo Landmeter <clandmeter@gmail.com>
+# Contributor: Carlo Landmeter <clandmeter@alpinelinux.org>
 # Maintainer: Justin Berthault <justin.berthault@zaclys.net>
 pkgname=micro
 pkgver=2.0.8
diff --git a/community/minidlna/APKBUILD b/community/minidlna/APKBUILD
index 05abcdc6c9870b2035d9c2a95d76410d0b205c0b..b58049af3531ed27c355619c89681f3f07b66910 100644
--- a/community/minidlna/APKBUILD
+++ b/community/minidlna/APKBUILD
@@ -1,4 +1,4 @@
-# Contributor: Carlo Landmeter <clandmeter@gmail.com>
+# Contributor: Carlo Landmeter <clandmeter@alpinelinux.org>
 # Maintainer: Francesco Colista <francesco.colista@gmail.com>
 pkgname=minidlna
 pkgver=1.2.1
diff --git a/community/miniupnpd/APKBUILD b/community/miniupnpd/APKBUILD
index 020872c0304bcb95997a657580c172ae28fed08b..59f7d05562d51f004a70f67062117a160b1a940c 100644
--- a/community/miniupnpd/APKBUILD
+++ b/community/miniupnpd/APKBUILD
@@ -1,4 +1,4 @@
-# Contributor: Carlo Landmeter <clandmeter@gmail.com>
+# Contributor: Carlo Landmeter <clandmeter@alpinelinux.org>
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=miniupnpd
 pkgver=2.1
diff --git a/community/mkvtoolnix/APKBUILD b/community/mkvtoolnix/APKBUILD
index d8a3028a8b590ed41dfd303908f700236caa8cb4..e44bf83401144f6735a35ed236ff510c06162be5 100644
--- a/community/mkvtoolnix/APKBUILD
+++ b/community/mkvtoolnix/APKBUILD
@@ -1,5 +1,5 @@
 # Contributor: Sören Tempel <soeren+alpine@soeren-tempel.net>
-# Contributor: Carlo Landmeter <clandmeter@gmail.com>
+# Contributor: Carlo Landmeter <clandmeter@alpinelinux.org>
 # Maintainer: Francesco Colista <fcolista@alpinelinux.org>
 pkgname=mkvtoolnix
 pkgver=52.0.0
diff --git a/community/mlt/APKBUILD b/community/mlt/APKBUILD
index 96e773518fb96df79c0bd7c6d11d0f029cf46672..83cd57922db70ad344785cf2d65d8dc2505f9fc6 100644
--- a/community/mlt/APKBUILD
+++ b/community/mlt/APKBUILD
@@ -1,4 +1,4 @@
-# Contributor: Carlo Landmeter <clandmeter@gmail.com>
+# Contributor: Carlo Landmeter <clandmeter@alpinelinux.org>
 # Maintainer: Kevin Daudt <kdaudt@alpinelinux.org>
 pkgname=mlt
 pkgver=6.22.1
diff --git a/community/mopidy/APKBUILD b/community/mopidy/APKBUILD
index 16f169eb6beb3090a3f791b4f365ea40f0020e1a..b2022f6edc77d7f630391bd217fab22fd272bc97 100644
--- a/community/mopidy/APKBUILD
+++ b/community/mopidy/APKBUILD
@@ -1,6 +1,6 @@
 # Contributor: Sören Tempel <soeren+alpine@soeren-tempel.net>
 # Contributor: Łukasz Jendrysik <scadu@yandex.com>
-# Contributor: Carlo Landmeter <clandmeter@gmail.com>
+# Contributor: Carlo Landmeter <clandmeter@alpinelinux.org>
 # Contributor: Galen Abell <galen@galenabell.com>
 # Maintainer: Bart Ribbers <bribbers@disroot.org>
 pkgname=mopidy
diff --git a/community/nbd/APKBUILD b/community/nbd/APKBUILD
index 6e229f887e38fe3112b650e9e4fdfaac141a8616..f7330ab62ab9d5a327501981b602b71d1972139f 100644
--- a/community/nbd/APKBUILD
+++ b/community/nbd/APKBUILD
@@ -1,8 +1,8 @@
 # Contributor: Sören Tempel <soeren+alpine@soeren-tempel.net>
-# Maintainer: Carlo Landmeter <clandmeter@gmail.com>
+# Maintainer: Carlo Landmeter <clandmeter@alpinelinux.org>
 pkgname=nbd
 pkgver=3.20
-pkgrel=0
+pkgrel=1
 pkgdesc="Tools for network block devices"
 url="http://nbd.sourceforge.net"
 arch="all"
diff --git a/community/netdata/APKBUILD b/community/netdata/APKBUILD
index 468a91a7508069b82efc8ea829b33d1058e756e8..dc96fe34ea01fdd7f0ae13e885312197c4a7ef3e 100644
--- a/community/netdata/APKBUILD
+++ b/community/netdata/APKBUILD
@@ -1,4 +1,4 @@
-# Contributor: Carlo Landmeter <clandmeter@gmail.com>
+# Contributor: Carlo Landmeter <clandmeter@alpinelinux.org>
 # Maintainer: Kevin Daudt <kdaudt@alpinelinux.org>
 pkgname=netdata
 pkgver=1.28.0
diff --git a/community/numix-icon-theme/APKBUILD b/community/numix-icon-theme/APKBUILD
index c81cef757da59b094259800709943a763bbc3da1..20724964fc95eeee3d598cb5b7d1c78ffda37a78 100644
--- a/community/numix-icon-theme/APKBUILD
+++ b/community/numix-icon-theme/APKBUILD
@@ -1,8 +1,8 @@
-# Contributor: Carlo Landmeter <clandmeter@gmail.com>
-# Maintainer: Carlo Landmeter <clandmeter@gmail.com>
+# Contributor: Carlo Landmeter <clandmeter@alpinelinux.org>
+# Maintainer: Carlo Landmeter <clandmeter@alpinelinux.org>
 pkgname=numix-icon-theme
 pkgver=20.06.07
-pkgrel=0
+pkgrel=1
 pkgdesc="Official icon theme from the Numix project"
 url="https://numixproject.github.io/"
 arch="noarch"
diff --git a/community/opensc/APKBUILD b/community/opensc/APKBUILD
index e286d8f55a127df9246a4ca9a4ea6e3b649486a1..bc10eabbf730e15980850afd481878f651744bc6 100644
--- a/community/opensc/APKBUILD
+++ b/community/opensc/APKBUILD
@@ -1,4 +1,4 @@
-# Contributor: Carlo Landmeter <clandmeter@gmail.com>
+# Contributor: Carlo Landmeter <clandmeter@alpinelinux.org>
 # Maintainer: Timo Teräs <timo.teras@iki.fi>
 pkgname=opensc
 _realname=OpenSC
diff --git a/community/openzwave/APKBUILD b/community/openzwave/APKBUILD
index 52b994ae5bbc36d7f2bffe2c20db19e20e6b7912..2d018cea73bae1c97b0e3c29a36c6f2b406e55ca 100644
--- a/community/openzwave/APKBUILD
+++ b/community/openzwave/APKBUILD
@@ -1,4 +1,4 @@
-# Contributor: Carlo Landmeter <clandmeter@gmail.com>
+# Contributor: Carlo Landmeter <clandmeter@alpinelinux.org>
 # Maintainer:
 pkgname=openzwave
 pkgver=1.6.974
diff --git a/community/oscam/APKBUILD b/community/oscam/APKBUILD
index 9edb77b6a60c948676ebd574217f3995d83da647..e3308173a7ffe4f2978060f48e6f35e623a4c35f 100644
--- a/community/oscam/APKBUILD
+++ b/community/oscam/APKBUILD
@@ -1,8 +1,8 @@
-# Contributor: Carlo Landmeter <clandmeter@gmail.com>
-# Maintainer: Carlo Landmeter <clandmeter@gmail.com>
+# Contributor: Carlo Landmeter <clandmeter@alpinelinux.org>
+# Maintainer: Carlo Landmeter <clandmeter@alpinelinux.org>
 pkgname=oscam
 pkgver=1.20_svn20201119
-pkgrel=0
+pkgrel=1
 _rev=11678
 pkgdesc="Open Source Conditional Access Module software"
 url="http://www.streamboard.tv/oscam/"
diff --git a/community/paper-gtk-theme/APKBUILD b/community/paper-gtk-theme/APKBUILD
index d238718766db643391e5b112a6af8fde4a7d076b..2089693df14cb720cf6601013ad9cae5569e1e2a 100644
--- a/community/paper-gtk-theme/APKBUILD
+++ b/community/paper-gtk-theme/APKBUILD
@@ -1,8 +1,8 @@
-# Contributor: Carlo Landmeter <clandmeter@gmail.com>
-# Maintainer: Carlo Landmeter <clandmeter@gmail.com>
+# Contributor: Carlo Landmeter <clandmeter@alpinelinux.org>
+# Maintainer: Carlo Landmeter <clandmeter@alpinelinux.org>
 pkgname=paper-gtk-theme
 pkgver=2.1.0
-pkgrel=1
+pkgrel=2
 pkgdesc="Paper Theme Suite"
 url="https://snwh.org/paper"
 arch="noarch"
diff --git a/community/paper-icon-theme/APKBUILD b/community/paper-icon-theme/APKBUILD
index a84535676bb58cb61317308d4457d6e50bfd3e65..98fb2f6f57001d7f9d94eb2928c19248959aaf61 100644
--- a/community/paper-icon-theme/APKBUILD
+++ b/community/paper-icon-theme/APKBUILD
@@ -1,8 +1,8 @@
-# Contributor: Carlo Landmeter <clandmeter@gmail.com>
-# Maintainer: Carlo Landmeter <clandmeter@gmail.com>
+# Contributor: Carlo Landmeter <clandmeter@alpinelinux.org>
+# Maintainer: Carlo Landmeter <clandmeter@alpinelinux.org>
 pkgname=paper-icon-theme
 pkgver=1.5.0
-pkgrel=2
+pkgrel=3
 pkgdesc="Paper is a modern freedesktop icon theme"
 url="https://snwh.org/paper"
 arch="noarch"
diff --git a/community/perl-class-methodmaker/APKBUILD b/community/perl-class-methodmaker/APKBUILD
index 3786654d2bb7c1a9b671869b8c5dd9cc974bc4b4..a13bd18515e11675a690cc57eac04477660c2a2d 100644
--- a/community/perl-class-methodmaker/APKBUILD
+++ b/community/perl-class-methodmaker/APKBUILD
@@ -1,5 +1,5 @@
 # Automatically generated by apkbuild-cpan, template 3
-# Contributor: Carlo Landmeter <clandmeter@gmail.com>
+# Contributor: Carlo Landmeter <clandmeter@alpinelinux.org>
 # Maintainer: Francesco Colista <fcolista@alpinelinux.org>
 pkgname=perl-class-methodmaker
 #_pkgreal is used by apkbuild-cpan to find modules at MetaCpan
diff --git a/community/perl-io-gzip/APKBUILD b/community/perl-io-gzip/APKBUILD
index 44487683701963b6a15c9d848d93b05a3df35df7..4b36af59f837d529fcb7ba2a39149fdbcef83fbf 100644
--- a/community/perl-io-gzip/APKBUILD
+++ b/community/perl-io-gzip/APKBUILD
@@ -1,5 +1,5 @@
 # Automatically generated by apkbuild-cpan, template 3
-# Contributor: Carlo Landmeter <clandmeter@gmail.com>
+# Contributor: Carlo Landmeter <clandmeter@alpinelinux.org>
 # Maintainer: Francesco Colista <fcolista@alpinelinux.org>
 pkgname=perl-io-gzip
 #_pkgreal is used by apkbuild-cpan to find modules at MetaCpan
diff --git a/community/perl-lingua-en-numbers-ordinate/APKBUILD b/community/perl-lingua-en-numbers-ordinate/APKBUILD
index 32f7fea37fad43ccb8135c0a76297c081021b003..4787abf1093703d98136809b8bce009848940d80 100644
--- a/community/perl-lingua-en-numbers-ordinate/APKBUILD
+++ b/community/perl-lingua-en-numbers-ordinate/APKBUILD
@@ -1,4 +1,4 @@
-# Contributor: Carlo Landmeter <clandmeter@gmail.com>
+# Contributor: Carlo Landmeter <clandmeter@alpinelinux.org>
 # Maintainer: Francesco Colista <fcolista@alpinelinux.org>
 pkgname=perl-lingua-en-numbers-ordinate
 pkgver=1.04
diff --git a/community/perl-lingua-preferred/APKBUILD b/community/perl-lingua-preferred/APKBUILD
index 49f798410868324f61674a60ca251e94ab9fa222..96e87870a169426bfcfb7030dc64eabb31517498 100644
--- a/community/perl-lingua-preferred/APKBUILD
+++ b/community/perl-lingua-preferred/APKBUILD
@@ -1,4 +1,4 @@
-# Contributor: Carlo Landmeter <clandmeter@gmail.com>
+# Contributor: Carlo Landmeter <clandmeter@alpinelinux.org>
 # Maintainer: Francesco Colista <fcolista@alpinelinux.org>
 pkgname=perl-lingua-preferred
 pkgver=0.2.4
diff --git a/community/perl-term-progressbar/APKBUILD b/community/perl-term-progressbar/APKBUILD
index 239a6e577dc90b38b3d4c7bed5dfed96f2427736..9da51b426a31a553801f1f86d8b8f8050e353838 100644
--- a/community/perl-term-progressbar/APKBUILD
+++ b/community/perl-term-progressbar/APKBUILD
@@ -1,4 +1,4 @@
-# Contributor: Carlo Landmeter <clandmeter@gmail.com>
+# Contributor: Carlo Landmeter <clandmeter@alpinelinux.org>
 # Maintainer: Francesco Colista <fcolista@alpinelinux.org>
 pkgname=perl-term-progressbar
 pkgver=2.22
diff --git a/community/perl-unicode-string/APKBUILD b/community/perl-unicode-string/APKBUILD
index 51617d7dd2ed52b775ff5476be64758052f2fb71..b745f855ce0eaf49f9b9e7180fcd33edc205e7c0 100644
--- a/community/perl-unicode-string/APKBUILD
+++ b/community/perl-unicode-string/APKBUILD
@@ -1,5 +1,5 @@
 # Automatically generated by apkbuild-cpan, template 1
-# Contributor: Carlo Landmeter <clandmeter@gmail.com>
+# Contributor: Carlo Landmeter <clandmeter@alpinelinux.org>
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=perl-unicode-string
 _pkgreal=Unicode-String
diff --git a/community/perl-xml-libxml/APKBUILD b/community/perl-xml-libxml/APKBUILD
index a5c9ce0276f4dcf9b95c80c28c87af465b7ed57e..b4113afb918742ee0a1dff66e87ec5f1a4ff68fa 100644
--- a/community/perl-xml-libxml/APKBUILD
+++ b/community/perl-xml-libxml/APKBUILD
@@ -1,5 +1,5 @@
 # Automatically generated by apkbuild-cpan, template 3
-# Contributor: Carlo Landmeter <clandmeter@gmail.com>
+# Contributor: Carlo Landmeter <clandmeter@alpinelinux.org>
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=perl-xml-libxml
 #_pkgreal is used by apkbuild-cpan to find modules at MetaCpan
diff --git a/community/phonon-backend-gstreamer/APKBUILD b/community/phonon-backend-gstreamer/APKBUILD
index 3c90fdb2d233d376c2c553b9a7aa9eb779c23650..6b30f4e306f947b7fda2aae819bbc0dac70348bb 100644
--- a/community/phonon-backend-gstreamer/APKBUILD
+++ b/community/phonon-backend-gstreamer/APKBUILD
@@ -1,4 +1,4 @@
-# Contributor: Carlo Landmeter <clandmeter@gmail.com>
+# Contributor: Carlo Landmeter <clandmeter@alpinelinux.org>
 # Maintainer: Francesco Colista <fcolista@alpinelinux.org>
 pkgname=phonon-backend-gstreamer
 pkgver=4.10.0
diff --git a/community/php7-pecl-apcu/APKBUILD b/community/php7-pecl-apcu/APKBUILD
index 75f83598aaba4f456684f5a1409588faf7882f35..f8db3d06851e129daf743511251f879d7563a088 100644
--- a/community/php7-pecl-apcu/APKBUILD
+++ b/community/php7-pecl-apcu/APKBUILD
@@ -1,9 +1,9 @@
-# Contributor: Carlo Landmeter <clandmeter@gmail.com>
-# Maintainer: Carlo Landmeter <clandmeter@gmail.com>
+# Contributor: Carlo Landmeter <clandmeter@alpinelinux.org>
+# Maintainer: Carlo Landmeter <clandmeter@alpinelinux.org>
 pkgname=php7-pecl-apcu
 _pkgreal=apcu
 pkgver=5.1.19
-pkgrel=0
+pkgrel=1
 pkgdesc="PHP extension APC User Cache - PECL"
 url="https://pecl.php.net/package/apcu"
 arch="all"
diff --git a/community/php8-pecl-apcu/APKBUILD b/community/php8-pecl-apcu/APKBUILD
index fa40a421292684ba1a46e2b46a1a723d42b84cd3..85f931e4d32ae3d0009958f70407b0848c96dce7 100644
--- a/community/php8-pecl-apcu/APKBUILD
+++ b/community/php8-pecl-apcu/APKBUILD
@@ -1,4 +1,4 @@
-# Contributor: Carlo Landmeter <clandmeter@gmail.com>
+# Contributor: Carlo Landmeter <clandmeter@alpinelinux.org>
 # Maintainer: Andy Postnikov <apostnikov@gmail.com>
 pkgname=php8-pecl-apcu
 _extname=apcu
diff --git a/community/pngquant/APKBUILD b/community/pngquant/APKBUILD
index 7c446c528551cc4072a3feede31993c8adf018dd..6150d0528c88d955c95489005c71460327746a84 100644
--- a/community/pngquant/APKBUILD
+++ b/community/pngquant/APKBUILD
@@ -1,4 +1,4 @@
-# Contributor: Carlo Landmeter <clandmeter@gmail.com>
+# Contributor: Carlo Landmeter <clandmeter@alpinelinux.org>
 # Maintainer: André Klitzing <aklitzing@gmail.com>
 pkgname=pngquant
 pkgver=2.13.1
diff --git a/community/pulseaudio/APKBUILD b/community/pulseaudio/APKBUILD
index 778f8ca0e713feb5d9e6f26f5ab1a6c26f287664..686ccacda45a875e6382cfe1a10120843317a0d0 100644
--- a/community/pulseaudio/APKBUILD
+++ b/community/pulseaudio/APKBUILD
@@ -1,7 +1,7 @@
 # Contributor: Leo <thinkabit.ukim@gmail.com>
 # Contributor: Pedro Filipe <xpecex@outlook.com>
 # Contributor: Sören Tempel <soeren+alpine@soeren-tempel.net>
-# Contributor: Carlo Landmeter <clandmeter@gmail.com>
+# Contributor: Carlo Landmeter <clandmeter@alpinelinux.org>
 # Contributor: Antoine Fontaine <antoine.fontaine@epfl.ch>
 # Maintainer: Leo <thinkabit.ukim@gmail.com>
 pkgname=pulseaudio
diff --git a/community/py3-configargparse/APKBUILD b/community/py3-configargparse/APKBUILD
index 911dcb736c6ecd56f975a14b6365fda901f2241a..e1bba20cc66b28346ec34d7b7fdee15d70e7d9c7 100644
--- a/community/py3-configargparse/APKBUILD
+++ b/community/py3-configargparse/APKBUILD
@@ -1,4 +1,4 @@
-# Contributor: Carlo Landmeter <clandmeter@gmail.com>
+# Contributor: Carlo Landmeter <clandmeter@alpinelinux.org>
 # Contributor: Jakub Jirutka <jakub@jirutka.cz>
 # Maintainer: Stuart Cardall <developer@it-offshore.co.uk>
 pkgname=py3-configargparse
diff --git a/community/py3-decorator/APKBUILD b/community/py3-decorator/APKBUILD
index b44967b404ef981d838c208d5ca475b868eccd92..eba84d69ab2abab6fd894036c74d93b7aa2f07fd 100644
--- a/community/py3-decorator/APKBUILD
+++ b/community/py3-decorator/APKBUILD
@@ -1,4 +1,4 @@
-# Contributor: Carlo Landmeter <clandmeter@gmail.com>
+# Contributor: Carlo Landmeter <clandmeter@alpinelinux.org>
 # Maintainer: Francesco Colista <fcolista@alpinelinux.org>
 pkgname=py3-decorator
 _pkgname=decorator
diff --git a/community/py3-dialog/APKBUILD b/community/py3-dialog/APKBUILD
index c3322d6a1d227b8c63ffe5fa9366a5b8fa0d07e3..0007def7584d1d381e72d9b1012ec120dc9b2ed0 100644
--- a/community/py3-dialog/APKBUILD
+++ b/community/py3-dialog/APKBUILD
@@ -1,4 +1,4 @@
-# Contributor: Carlo Landmeter <clandmeter@gmail.com>
+# Contributor: Carlo Landmeter <clandmeter@alpinelinux.org>
 # Maintainer: Francesco Colista <fcolista@alpinelinux.org>
 pkgname=py3-dialog
 pkgver=3.5.1
diff --git a/community/py3-gst/APKBUILD b/community/py3-gst/APKBUILD
index d9d8b776f6cbd5e0691b3c628b121cb90a0c352c..e6686b1a85a0b2da796d6e47256c12554cce1a62 100644
--- a/community/py3-gst/APKBUILD
+++ b/community/py3-gst/APKBUILD
@@ -1,4 +1,4 @@
-# Contributor: Carlo Landmeter <clandmeter@gmail.com>
+# Contributor: Carlo Landmeter <clandmeter@alpinelinux.org>
 # Maintainer:
 pkgname=py3-gst
 pkgver=1.18.2
diff --git a/community/py3-ipaddress/APKBUILD b/community/py3-ipaddress/APKBUILD
index f9d0a5977ae9b0b0a4c8080b954bc7ad124134ac..0e8981bd41bf99c6fdda5b711e5baaeae72e192a 100644
--- a/community/py3-ipaddress/APKBUILD
+++ b/community/py3-ipaddress/APKBUILD
@@ -1,4 +1,4 @@
-# Contributor: Carlo Landmeter <clandmeter@gmail.com>
+# Contributor: Carlo Landmeter <clandmeter@alpinelinux.org>
 # Maintainer: Francesco Colista <fcolista@alpinelinux.org>
 pkgname=py3-ipaddress
 _pkgname=ipaddress
diff --git a/community/py3-jellyfish/APKBUILD b/community/py3-jellyfish/APKBUILD
index f2d80616b4149a23cdca015e78924bb73cdac11a..85be884bc08f487231a140049b23326cbab2a6f8 100644
--- a/community/py3-jellyfish/APKBUILD
+++ b/community/py3-jellyfish/APKBUILD
@@ -1,8 +1,8 @@
-# Contributor: Carlo Landmeter <clandmeter@gmail.com>
-# Maintainer: Carlo Landmeter <clandmeter@gmail.com>
+# Contributor: Carlo Landmeter <clandmeter@alpinelinux.org>
+# Maintainer: Carlo Landmeter <clandmeter@alpinelinux.org>
 pkgname=py3-jellyfish
 pkgver=0.8.2
-pkgrel=0
+pkgrel=1
 pkgdesc="Python library for approximate and phonetic string matching"
 url="https://github.com/jamesturk/jellyfish"
 arch="all"
diff --git a/community/py3-livereload/APKBUILD b/community/py3-livereload/APKBUILD
index 03bdd2b073ce2252f8a3cf0be866c501c1677e0b..0f627cc27d4a15b551aabf6632cfa8ac71ae8729 100644
--- a/community/py3-livereload/APKBUILD
+++ b/community/py3-livereload/APKBUILD
@@ -1,4 +1,4 @@
-# Contributor: Carlo Landmeter <clandmeter@gmail.com>
+# Contributor: Carlo Landmeter <clandmeter@alpinelinux.org>
 # Maintainer: Francesco Colista <fcolista@alpinelinux.org>
 pkgname=py3-livereload
 _pyname=livereload
diff --git a/community/py3-munkres/APKBUILD b/community/py3-munkres/APKBUILD
index 2d9674d8af4462dfaf2f52ebb0d991d293a30988..8c44c4d2877ee07264654c26a4aec30eb2fc0ba9 100644
--- a/community/py3-munkres/APKBUILD
+++ b/community/py3-munkres/APKBUILD
@@ -1,4 +1,4 @@
-# Contributor: Carlo Landmeter <clandmeter@gmail.com>
+# Contributor: Carlo Landmeter <clandmeter@alpinelinux.org>
 # Maintainer: Fabian Affolter <fabian@affolter-engineering.ch>
 pkgname=py3-munkres
 _pkgname=munkres
diff --git a/community/py3-musicbrainzngs/APKBUILD b/community/py3-musicbrainzngs/APKBUILD
index ad038bc84dec16ff71a24edf7dc7e4a197983b0a..34512bcb4306c4d52474aa638a0e9455ca4d9330 100644
--- a/community/py3-musicbrainzngs/APKBUILD
+++ b/community/py3-musicbrainzngs/APKBUILD
@@ -1,4 +1,4 @@
-# Contributor: Carlo Landmeter <clandmeter@gmail.com>
+# Contributor: Carlo Landmeter <clandmeter@alpinelinux.org>
 # Maintainer:
 pkgname=py3-musicbrainzngs
 _pkgname=musicbrainzngs
diff --git a/community/py3-ndg_httpsclient/APKBUILD b/community/py3-ndg_httpsclient/APKBUILD
index 65649ca921fe7fcef82e943015fe8a1b9cd57f87..ec43602445a6cb4e003b3421a02261df8ab28907 100644
--- a/community/py3-ndg_httpsclient/APKBUILD
+++ b/community/py3-ndg_httpsclient/APKBUILD
@@ -1,4 +1,4 @@
-# Contributor: Carlo Landmeter <clandmeter@gmail.com>
+# Contributor: Carlo Landmeter <clandmeter@alpinelinux.org>
 # Maintainer: prspkt <prspkt@protonmail.com>
 pkgname=py3-ndg_httpsclient
 _pkgname=ndg_httpsclient
diff --git a/community/py3-openzwave/APKBUILD b/community/py3-openzwave/APKBUILD
index 796f25d5f7adefdad7d600c0b999338b76b271b0..e8172e11539c3f56f7c164f90d1bc7c5be5c3f06 100644
--- a/community/py3-openzwave/APKBUILD
+++ b/community/py3-openzwave/APKBUILD
@@ -1,9 +1,9 @@
-# Contributor: Carlo Landmeter <clandmeter@gmail.com>
-# Maintainer: Carlo Landmeter <clandmeter@gmail.com>
+# Contributor: Carlo Landmeter <clandmeter@alpinelinux.org>
+# Maintainer: Carlo Landmeter <clandmeter@alpinelinux.org>
 _name=python-openzwave
 pkgname=py3-openzwave
 pkgver=0.4.19
-pkgrel=4
+pkgrel=5
 pkgdesc="Python wrapper for openzwave"
 url="http://www.openzwave.com/"
 arch="all"
diff --git a/community/py3-parsedatetime/APKBUILD b/community/py3-parsedatetime/APKBUILD
index 9841f548f719eb17e200aff3b965f8e7f4bab6e9..89fa26754a722e24fe3b7811ecbaf7b1fa637d7c 100644
--- a/community/py3-parsedatetime/APKBUILD
+++ b/community/py3-parsedatetime/APKBUILD
@@ -1,4 +1,4 @@
-# Contributor: Carlo Landmeter <clandmeter@gmail.com>
+# Contributor: Carlo Landmeter <clandmeter@alpinelinux.org>
 # Maintainer: Roberto Oliveira <robertoguimaraes8@gmail.com>
 pkgname=py3-parsedatetime
 pkgver=2.6
diff --git a/community/py3-pathtools/APKBUILD b/community/py3-pathtools/APKBUILD
index 4cfaa700ce32b57571347300b8872d8aba5b9efe..1dea85ff752c2cd84a57772d6c14825ad3ae1e87 100644
--- a/community/py3-pathtools/APKBUILD
+++ b/community/py3-pathtools/APKBUILD
@@ -1,4 +1,4 @@
-# Contributor: Carlo Landmeter <clandmeter@gmail.com>
+# Contributor: Carlo Landmeter <clandmeter@alpinelinux.org>
 # Maintainer: Francesco Colista <fcolista@alpinelinux.org>
 pkgname=py3-pathtools
 _pkgname=pathtools
diff --git a/community/py3-pydispatcher/APKBUILD b/community/py3-pydispatcher/APKBUILD
index 42d61b0185ea3f94b48be958ea06069a1bd061a3..35d11c3da8e3b57efe20036018961b9aec95a48c 100644
--- a/community/py3-pydispatcher/APKBUILD
+++ b/community/py3-pydispatcher/APKBUILD
@@ -1,4 +1,4 @@
-# Contributor: Carlo Landmeter <clandmeter@gmail.com>
+# Contributor: Carlo Landmeter <clandmeter@alpinelinux.org>
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 _pyname=PyDispatcher
 pkgname=py3-pydispatcher
diff --git a/community/py3-pykka/APKBUILD b/community/py3-pykka/APKBUILD
index cc5e2d27c928e3e4669a934e6a4ce8e3dc4fbcf1..5d40febe3f0007c9c0977658dd8087e184379811 100644
--- a/community/py3-pykka/APKBUILD
+++ b/community/py3-pykka/APKBUILD
@@ -1,4 +1,4 @@
-# Contributor: Carlo Landmeter <clandmeter@gmail.com>
+# Contributor: Carlo Landmeter <clandmeter@alpinelinux.org>
 # Maintainer: Bart Ribbers <bribbers@disroot.org>
 pkgname=py3-pykka
 pkgver=2.0.3
diff --git a/community/py3-pylast/APKBUILD b/community/py3-pylast/APKBUILD
index b00dae86eff7273435d0727af8bb5c3771524190..d3c17f1872e95a09bc3c973c35b91234285129af 100644
--- a/community/py3-pylast/APKBUILD
+++ b/community/py3-pylast/APKBUILD
@@ -1,4 +1,4 @@
-# Contributor: Carlo Landmeter <clandmeter@gmail.com>
+# Contributor: Carlo Landmeter <clandmeter@alpinelinux.org>
 # Maintainer: Fabian Affolter <fabian@affolter-engineering.ch>
 pkgname=py3-pylast
 pkgver=3.3.0
diff --git a/community/py3-pyrfc3339/APKBUILD b/community/py3-pyrfc3339/APKBUILD
index e0b271a16376382434d6e918e769cf9cf092d1d3..f77b0da867859643f4f0009ac90ac7aac1cc9962 100644
--- a/community/py3-pyrfc3339/APKBUILD
+++ b/community/py3-pyrfc3339/APKBUILD
@@ -1,4 +1,4 @@
-# Contributor: Carlo Landmeter <clandmeter@gmail.com>
+# Contributor: Carlo Landmeter <clandmeter@alpinelinux.org>
 # Maintainer: Roberto Oliveira <robertoguimaraes8@gmail.com>
 pkgname=py3-pyrfc3339
 _pkgname=pyRFC3339
diff --git a/community/py3-sphinx-autobuild/APKBUILD b/community/py3-sphinx-autobuild/APKBUILD
index f9c5265767ae230946381ef45501c4ca4f4f5683..b6b9c556b1aab70251dc81688d595200c1bc1c4a 100644
--- a/community/py3-sphinx-autobuild/APKBUILD
+++ b/community/py3-sphinx-autobuild/APKBUILD
@@ -1,4 +1,4 @@
-# Contributor: Carlo Landmeter <clandmeter@gmail.com>
+# Contributor: Carlo Landmeter <clandmeter@alpinelinux.org>
 # Maintainer: Francesco Colista <fcolista@alpinelinux.org>
 pkgname=py3-sphinx-autobuild
 _pkgname=sphinx-autobuild
diff --git a/community/py3-sqlalchemy-migrate/APKBUILD b/community/py3-sqlalchemy-migrate/APKBUILD
index 45fad166ac69adf6530baee7178b72eb724d3663..0a87043a42cb8fc42d68f3ec12c173223458b1e8 100644
--- a/community/py3-sqlalchemy-migrate/APKBUILD
+++ b/community/py3-sqlalchemy-migrate/APKBUILD
@@ -1,4 +1,4 @@
-# Contributor: Carlo Landmeter <clandmeter@gmail.com>
+# Contributor: Carlo Landmeter <clandmeter@alpinelinux.org>
 # Maintainer: Francesco Colista <fcolista@alpinelinux.org>
 pkgname=py3-sqlalchemy-migrate
 _pkgname=sqlalchemy-migrate
diff --git a/community/py3-tempita/APKBUILD b/community/py3-tempita/APKBUILD
index 2f462f7b955b5d626ef6347ce27b85a458727ceb..16b7be2e93a6406d1b9b74f238add4c66cbad7d8 100644
--- a/community/py3-tempita/APKBUILD
+++ b/community/py3-tempita/APKBUILD
@@ -1,4 +1,4 @@
-# Contributor: Carlo Landmeter <clandmeter@gmail.com>
+# Contributor: Carlo Landmeter <clandmeter@alpinelinux.org>
 # Maintainer: Fabian Affolter <fabian@affolter-engineering.ch>
 pkgname=py3-tempita
 _pkgname=Tempita
diff --git a/community/py3-watchdog/APKBUILD b/community/py3-watchdog/APKBUILD
index f8b7cd9af9ea2bd98dc1054435aad19ab789e0eb..95502d54e63f17ae7efb0843592fcd6196243250 100644
--- a/community/py3-watchdog/APKBUILD
+++ b/community/py3-watchdog/APKBUILD
@@ -1,4 +1,4 @@
-# Contributor: Carlo Landmeter <clandmeter@gmail.com>
+# Contributor: Carlo Landmeter <clandmeter@alpinelinux.org>
 # Maintainer: Francesco Colista <fcolista@alpinelinux.org>
 pkgname=py3-watchdog
 _pkgname=watchdog
diff --git a/community/qt5-qtwebsockets/APKBUILD b/community/qt5-qtwebsockets/APKBUILD
index 0f58a7bd17b847e8ce58120fb3745459d4a19dad..eb5ff6fa1c00a5a4db6376a23802f4a7d0c43a41 100644
--- a/community/qt5-qtwebsockets/APKBUILD
+++ b/community/qt5-qtwebsockets/APKBUILD
@@ -1,4 +1,4 @@
-# Contributor: Carlo Landmeter <clandmeter@gmail.com>
+# Contributor: Carlo Landmeter <clandmeter@alpinelinux.org>
 # Maintainer: Bart Ribbers <bribbers@disroot.org>
 pkgname=qt5-qtwebsockets
 pkgver=5.15.2
diff --git a/community/qt5-qtx11extras/APKBUILD b/community/qt5-qtx11extras/APKBUILD
index b6706233dd370ec43c942479f6a6c574e5b80bb4..674d6725da963d73d72f504e8f47c1c91c1d282b 100644
--- a/community/qt5-qtx11extras/APKBUILD
+++ b/community/qt5-qtx11extras/APKBUILD
@@ -1,4 +1,4 @@
-# Contributor: Carlo Landmeter <clandmeter@gmail.com>
+# Contributor: Carlo Landmeter <clandmeter@alpinelinux.org>
 # Maintainer: Bart Ribbers <bribbers@disroot.org>
 pkgname=qt5-qtx11extras
 pkgver=5.15.2
diff --git a/community/quazip/APKBUILD b/community/quazip/APKBUILD
index e04438f07b0372016b14fef87c6fe4b45257df68..11e83fce7d200e58c123b23e1ab0b05d147c32cc 100644
--- a/community/quazip/APKBUILD
+++ b/community/quazip/APKBUILD
@@ -1,5 +1,5 @@
 # Contributor: Leo <thinkabit.ukim@gmail.com>
-# Contributor: Carlo Landmeter <clandmeter@gmail.com>
+# Contributor: Carlo Landmeter <clandmeter@alpinelinux.org>
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=quazip
 pkgver=0.9.1
diff --git a/community/sbc/APKBUILD b/community/sbc/APKBUILD
index bc713b12808bc4f8c814237363679690b6ecf57a..c5fa5820ef9bd50e8bfb2404a22b90292b2401b0 100644
--- a/community/sbc/APKBUILD
+++ b/community/sbc/APKBUILD
@@ -1,4 +1,4 @@
-# Contributor: Carlo Landmeter <clandmeter@gmail.com>
+# Contributor: Carlo Landmeter <clandmeter@alpinelinux.org>
 # Maintainer: Mark Riedesel <mark@klowner.com>
 pkgname=sbc
 pkgver=1.4
diff --git a/community/sg3_utils/APKBUILD b/community/sg3_utils/APKBUILD
index 1ad926569c41110f8d188bd88288ebf4b60d408b..8250b83b028fbf244f93da36bc08fe44d7446b48 100644
--- a/community/sg3_utils/APKBUILD
+++ b/community/sg3_utils/APKBUILD
@@ -1,4 +1,4 @@
-# Contributor: Carlo Landmeter <clandmeter@gmail.com>
+# Contributor: Carlo Landmeter <clandmeter@alpinelinux.org>
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=sg3_utils
 pkgver=1.45
diff --git a/community/snapcast/APKBUILD b/community/snapcast/APKBUILD
index 65bd5a298442d5dfb42ea32b7b4eadaa1cbb6fec..cfdd5c4948f56ae31d0fde11557251f38fa40999 100644
--- a/community/snapcast/APKBUILD
+++ b/community/snapcast/APKBUILD
@@ -1,4 +1,4 @@
-# Contributor: Carlo Landmeter <clandmeter@gmail.com>
+# Contributor: Carlo Landmeter <clandmeter@alpinelinux.org>
 # Maintainer: Bart Ribbers <bribbers@disroot.org>
 pkgname=snapcast
 pkgver=0.22.0
diff --git a/community/sparsehash/APKBUILD b/community/sparsehash/APKBUILD
index 5b0a3bd0d0c991fd9602fef7a7be754d9a35354e..db76f76a8e0d9fb1ef9880d07cb8145250d063a8 100644
--- a/community/sparsehash/APKBUILD
+++ b/community/sparsehash/APKBUILD
@@ -1,4 +1,4 @@
-# Contributor: Carlo Landmeter <clandmeter@gmail.com>
+# Contributor: Carlo Landmeter <clandmeter@alpinelinux.org>
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=sparsehash
 pkgver=2.0.4
diff --git a/community/syncthing/APKBUILD b/community/syncthing/APKBUILD
index 94bb5b6d163b63c4c38fb7857470f71fb0890e34..cc5ba20ca1ca809b14b630b7b7141d1e7f6057e2 100644
--- a/community/syncthing/APKBUILD
+++ b/community/syncthing/APKBUILD
@@ -1,5 +1,5 @@
 # Contributor: Łukasz Jendrysik <scadu@yandex.com>
-# Contributor: Carlo Landmeter <clandmeter@gmail.com>
+# Contributor: Carlo Landmeter <clandmeter@alpinelinux.org>
 # Contributor: Sören Tempel <soeren+alpine@soeren-tempel.net>
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=syncthing
diff --git a/community/sysstat/APKBUILD b/community/sysstat/APKBUILD
index 0560842743f005744a35edcb8c94de5008fcc656..b299a1d41e085a445d5a521fac2de8101a3bc3d0 100644
--- a/community/sysstat/APKBUILD
+++ b/community/sysstat/APKBUILD
@@ -1,4 +1,4 @@
-# Contributor: Carlo Landmeter <clandmeter@gmail.com>
+# Contributor: Carlo Landmeter <clandmeter@alpinelinux.org>
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=sysstat
 # !!! 12.4.x are stable versions !!!
diff --git a/community/tesseract-ocr/APKBUILD b/community/tesseract-ocr/APKBUILD
index 2e6bb7749a13cb8e47b04d0df77f50525da3a450..9773146a290f26a447e7a128ab84ecdb09303647 100644
--- a/community/tesseract-ocr/APKBUILD
+++ b/community/tesseract-ocr/APKBUILD
@@ -1,4 +1,4 @@
-# Contributor: Carlo Landmeter <clandmeter@gmail.com>
+# Contributor: Carlo Landmeter <clandmeter@alpinelinux.org>
 # Maintainer: Francesco Colista <fcolista@alpinelinux.org>
 pkgname=tesseract-ocr
 pkgver=4.1.1
diff --git a/community/tinc-pre/APKBUILD b/community/tinc-pre/APKBUILD
index 03653364ebe97b0e4bf4170a220513e5e62f212e..dfe9cc04a759928b8014c241a4fffc19324d8bc7 100644
--- a/community/tinc-pre/APKBUILD
+++ b/community/tinc-pre/APKBUILD
@@ -1,9 +1,9 @@
-# Contributor: Carlo Landmeter <clandmeter@gmail.com>
-# Maintainer: Carlo Landmeter <clandmeter@gmail.com>
+# Contributor: Carlo Landmeter <clandmeter@alpinelinux.org>
+# Maintainer: Carlo Landmeter <clandmeter@alpinelinux.org>
 pkgname=tinc-pre
 _distver="1.1pre17"
 pkgver=${_distver/pre/.}
-pkgrel=2
+pkgrel=3
 pkgdesc="Virtual Private Network (VPN) daemon (pre-release)"
 url="https://tinc-vpn.org/"
 # s390x: tests hang
diff --git a/community/tinyxml/APKBUILD b/community/tinyxml/APKBUILD
index 5d641ab51175fd037194482d742a41e67f536ce9..06148ee0ab9ef8de26361426daeeb24fffe2d736 100644
--- a/community/tinyxml/APKBUILD
+++ b/community/tinyxml/APKBUILD
@@ -1,4 +1,4 @@
-# Contributor: Carlo Landmeter <clandmeter@gmail.com>
+# Contributor: Carlo Landmeter <clandmeter@alpinelinux.org>
 # Maintainer:
 pkgname=tinyxml
 pkgver=2.6.2
diff --git a/community/transmission/APKBUILD b/community/transmission/APKBUILD
index 0bff49f83f8e3034dd2efa0e14c65bce17206b4c..c0c856ff3992b0e37cb5d765ccd09bf37ad80900 100644
--- a/community/transmission/APKBUILD
+++ b/community/transmission/APKBUILD
@@ -1,5 +1,5 @@
 # Contributor: Rasmus Thomsen <oss@cogitri.dev>
-# Contributor: Carlo Landmeter <clandmeter@gmail.com>
+# Contributor: Carlo Landmeter <clandmeter@alpinelinux.org>
 # Maintainer: Rasmus Thomsen <oss@cogitri.dev>
 pkgname=transmission
 pkgver=3.00
diff --git a/community/ts/APKBUILD b/community/ts/APKBUILD
index e5f50a38bfb76dcae60d61970e3b53bbf7503844..e7a407dac9dc054caba960d500a5905c55ce51b2 100644
--- a/community/ts/APKBUILD
+++ b/community/ts/APKBUILD
@@ -1,4 +1,4 @@
-# Contributor: Carlo Landmeter <clandmeter@gmail.com>
+# Contributor: Carlo Landmeter <clandmeter@alpinelinux.org>
 # Maintainer: Michał Polański <michal@polanski.me>
 pkgname=ts
 pkgver=1.0.1
diff --git a/community/ttf2ufm/APKBUILD b/community/ttf2ufm/APKBUILD
index 591838688fb2cafe0d7c2cc6820468bd5d3f878b..2ce1c8cb897f381dbf5afdcb048f35367ffaff47 100644
--- a/community/ttf2ufm/APKBUILD
+++ b/community/ttf2ufm/APKBUILD
@@ -1,4 +1,4 @@
-# Contributor: Carlo Landmeter <clandmeter@gmail.com>
+# Contributor: Carlo Landmeter <clandmeter@alpinelinux.org>
 # Maintainer:
 pkgname=ttf2ufm
 pkgver=3.4.4
diff --git a/community/unpaper/APKBUILD b/community/unpaper/APKBUILD
index adde1ed2a8123df4bd1d48e60837434205780afd..9084487f1fd064600f11ef23f3ea8ab77fba2b63 100644
--- a/community/unpaper/APKBUILD
+++ b/community/unpaper/APKBUILD
@@ -1,8 +1,8 @@
-# Contributor: Carlo Landmeter <clandmeter@gmail.com>
-# Maintainer: Carlo Landmeter <clandmeter@gmail.com>
+# Contributor: Carlo Landmeter <clandmeter@alpinelinux.org>
+# Maintainer: Carlo Landmeter <clandmeter@alpinelinux.org>
 pkgname=unpaper
 pkgver=6.1
-pkgrel=1
+pkgrel=2
 pkgdesc="post-processing tool for scanned sheets of paper"
 url="https://github.com/Flameeyes/unpaper"
 arch="all"
diff --git a/community/urlview/APKBUILD b/community/urlview/APKBUILD
index f87f86d4a088a2c2233b7eb4ad0966f80e47ded0..723f32441fb5fd0c23bbc0962308e78fecf7d0fb 100644
--- a/community/urlview/APKBUILD
+++ b/community/urlview/APKBUILD
@@ -1,4 +1,4 @@
-# Contributor: Carlo Landmeter <clandmeter@gmail.com>
+# Contributor: Carlo Landmeter <clandmeter@alpinelinux.org>
 # Contributor: Leo <thinkabit.ukim@gmail.com>
 # Maintainer:
 pkgname=urlview
diff --git a/community/vdr/APKBUILD b/community/vdr/APKBUILD
index bef7378f6f512feb63abe6dc45aa14f327e0f4a5..0345acbdf3d8135733b2f94c1e62898669088cab 100644
--- a/community/vdr/APKBUILD
+++ b/community/vdr/APKBUILD
@@ -1,5 +1,5 @@
 # Contributor: Stefan Reiff <kroko87@hotmail.com>
-# Contributor: Carlo Landmeter <clandmeter@gmail.com>
+# Contributor: Carlo Landmeter <clandmeter@alpinelinux.org>
 # Maintainer: Taner Tas <taner76@gmail.com>
 pkgname=vdr
 pkgver=2.4.6
diff --git a/community/vsftpd/APKBUILD b/community/vsftpd/APKBUILD
index 7ae0b80c9c8130ae4ec15a90aa67a793df9cc34e..4b62020a7a31cc17e788f2689cb10272af5b40ba 100644
--- a/community/vsftpd/APKBUILD
+++ b/community/vsftpd/APKBUILD
@@ -1,4 +1,4 @@
-# Contributor: Carlo Landmeter <clandmeter@gmail.com>
+# Contributor: Carlo Landmeter <clandmeter@alpinelinux.org>
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=vsftpd
 pkgver=3.0.3
diff --git a/community/websocket++/APKBUILD b/community/websocket++/APKBUILD
index fab5a447284fc3c8df7c815665d9c49c505036c2..ddac5d2a8c8f7143be656da6ff3e935ad8c0654b 100644
--- a/community/websocket++/APKBUILD
+++ b/community/websocket++/APKBUILD
@@ -1,4 +1,4 @@
-# Contributor: Carlo Landmeter <clandmeter@gmail.com>
+# Contributor: Carlo Landmeter <clandmeter@alpinelinux.org>
 # Maintainer: prspkt <prspkt@protonmail.com>
 pkgname=websocket++
 pkgver=0.8.2
diff --git a/community/x11vnc/APKBUILD b/community/x11vnc/APKBUILD
index acf06e85b4136eda1aec9ff0ba076fdbfc7aaf50..58474a9020dbe06e83e5de5ebfab988efe664221 100644
--- a/community/x11vnc/APKBUILD
+++ b/community/x11vnc/APKBUILD
@@ -1,4 +1,4 @@
-# Contributor: Carlo Landmeter <clandmeter@gmail.com>
+# Contributor: Carlo Landmeter <clandmeter@alpinelinux.org>
 # Maintainer: Tuan M. Hoang <tmhoang@flatglobe.org>
 pkgname=x11vnc
 pkgver=0.9.16
diff --git a/community/x265/APKBUILD b/community/x265/APKBUILD
index f5a8dde2b2c1c3b53d081c6fd537c83ad0f87b9e..9d6ce3aaf0ef8979b5454308eaeba8b3b129da16 100644
--- a/community/x265/APKBUILD
+++ b/community/x265/APKBUILD
@@ -1,4 +1,4 @@
-# Contributor: Carlo Landmeter <clandmeter@gmail.com>
+# Contributor: Carlo Landmeter <clandmeter@alpinelinux.org>
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=x265
 pkgver=3.4
diff --git a/community/xf86-video-modesetting/APKBUILD b/community/xf86-video-modesetting/APKBUILD
index 87dc2a6e6302a8d6b715193d4f0e4e4bbcbb3d38..a00655858059dd3dec2823ac407a6a4a655c3580 100644
--- a/community/xf86-video-modesetting/APKBUILD
+++ b/community/xf86-video-modesetting/APKBUILD
@@ -1,4 +1,4 @@
-# Contributor: Carlo Landmeter <clandmeter@gmail.com>
+# Contributor: Carlo Landmeter <clandmeter@alpinelinux.org>
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=xf86-video-modesetting
 pkgver=0.9.0
diff --git a/community/xf86-video-qxl/APKBUILD b/community/xf86-video-qxl/APKBUILD
index 1924b85f6d2ada4d5720631344ce0dd0a727c99a..4b50111895e6c4f6f50fccf9a0c6b54bb9ee78d9 100644
--- a/community/xf86-video-qxl/APKBUILD
+++ b/community/xf86-video-qxl/APKBUILD
@@ -1,4 +1,4 @@
-# Contributor: Carlo Landmeter <clandmeter@gmail.com>
+# Contributor: Carlo Landmeter <clandmeter@alpinelinux.org>
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=xf86-video-qxl
 pkgver=0.1.5
diff --git a/community/xmltv/APKBUILD b/community/xmltv/APKBUILD
index fa3a1baa5369b7edae5d0feaa1ca9cd5291e6006..8023d992c7cb779ed029020ae1ee3aed2fbbcc58 100644
--- a/community/xmltv/APKBUILD
+++ b/community/xmltv/APKBUILD
@@ -1,4 +1,4 @@
-# Contributor: Carlo Landmeter <clandmeter@gmail.com>
+# Contributor: Carlo Landmeter <clandmeter@alpinelinux.org>
 # Maintainer: Francesco Colista <fcolista@alpinelinux.org>
 pkgname=xmltv
 pkgver=0.6.3
diff --git a/community/xterm/APKBUILD b/community/xterm/APKBUILD
index f068eaf39a5fe4a4d940646f4f5982e64b434710..0cfca8ce5d44b50bd5688d08bc752d032001100d 100644
--- a/community/xterm/APKBUILD
+++ b/community/xterm/APKBUILD
@@ -1,4 +1,4 @@
-# Contributor: Carlo Landmeter <clandmeter@gmail.com>
+# Contributor: Carlo Landmeter <clandmeter@alpinelinux.org>
 # Maintainer: Jakub Jirutka <jakub@jirutka.cz>
 pkgname=xterm
 pkgver=363
diff --git a/community/ympd/APKBUILD b/community/ympd/APKBUILD
index efa1b05da5228717acefeab7a30b60c2b7879c26..5b018f8bc9bb187bc2a12134352dbf9ef0629672 100644
--- a/community/ympd/APKBUILD
+++ b/community/ympd/APKBUILD
@@ -1,4 +1,4 @@
-# Contributor: Carlo Landmeter <clandmeter@gmail.com>
+# Contributor: Carlo Landmeter <clandmeter@alpinelinux.org>
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=ympd
 pkgver=1.3.0