diff --git a/.mailmap b/.mailmap
index 99c7d4617ddcfa093de07653a08b8b22fd2529fc..17eb222f3f8adc0aafe4cb1ac8ef673d907ca0a9 100644
--- a/.mailmap
+++ b/.mailmap
@@ -7,3 +7,4 @@ Lucas Ramage <ramage.lucas@protonmail.com> <oxr463@gmx.us>
 Lucas Ramage <ramage.lucas@protonmail.com> <ramage.lucas@openmailbox.org>
 Lucas Ramage <ramage.lucas@protonmail.com> <lramage@star2star.com>
 <eu@eju.no> <eivind@uggedal.com>
+Oliver Smith <ollieparanoid@postmarketos.org> <ollieparanoid@bitmessage.ch>
diff --git a/main/busybox/APKBUILD b/main/busybox/APKBUILD
index 05ce577f69027cce3e3396f1ee013614b157c377..4001b918fe7ca18b8d92003adcd0694020b4c3c4 100644
--- a/main/busybox/APKBUILD
+++ b/main/busybox/APKBUILD
@@ -1,5 +1,5 @@
 # Contributor: Łukasz Jendrysik <scadu@yandex.com>
-# Contributor: Oliver Smith <ollieparanoid@bitmessage.ch>
+# Contributor: Oliver Smith <ollieparanoid@postmarketos.org>
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=busybox
 pkgver=1.31.0
diff --git a/main/linux-firmware/APKBUILD b/main/linux-firmware/APKBUILD
index a7d36c849c92ee7b3e293f438e1c2f60c6e10958..511736816e77658c510acb697e66b67efa9856bc 100644
--- a/main/linux-firmware/APKBUILD
+++ b/main/linux-firmware/APKBUILD
@@ -1,4 +1,4 @@
-# Contributor: Oliver Smith <ollieparanoid@bitmessage.ch>
+# Contributor: Oliver Smith <ollieparanoid@postmarketos.org>
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=linux-firmware
 pkgver=20190322