diff --git a/mail/msmtp-scripts/Makefile b/mail/msmtp-scripts/Makefile
index b1441bb95..a1ae713a2 100644
--- a/mail/msmtp-scripts/Makefile
+++ b/mail/msmtp-scripts/Makefile
@@ -1,7 +1,7 @@
 #
 # Copyright (C) 2009 David Cooper <dave@kupesoft.com>
 # Copyright (C) 2009-2015 OpenWrt.org
-# Copyright (C) 2016 Daniel Dickinson <lede@daniel.thecshore.com>
+# Copyright (C) 2016 Daniel Dickinson <cshored@thecshore.com>
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
@@ -19,7 +19,7 @@ PKG_HASH:=2aec48d47b02facf2a33cf97a7434e969c1a054224406e6c55320d825c7902b2
 
 PKG_LICENSE:=GPL-3.0+
 PKG_LICENSE_FILES:=COPYING
-PKG_MAINTAINER:=Daniel Dickinson <lede@daniel.thecshore.com>
+PKG_MAINTAINER:=Daniel Dickinson <cshoreded@thecshore.com>
 
 include $(INCLUDE_DIR)/package.mk
 
diff --git a/net/gitolite/Makefile b/net/gitolite/Makefile
index 52f0acdc6..c6fd4a5bb 100644
--- a/net/gitolite/Makefile
+++ b/net/gitolite/Makefile
@@ -28,7 +28,7 @@ define Package/gitolite
   DEPENDS:=+perlbase-essential +perlbase-sys +perlbase-data +perlbase-digest +perlbase-env +perlbase-time +git +perlbase-findbin +perlbase-storable +perlbase-text +perlbase-getopt +perlbase-utf8 +openssh-keygen +openssh-server +openssh-moduli perl
   TITLE:=Easy administration of git repositories
   URL:=http://gitolite.com/gitlolite
-  MAINTAINER:=Daniel Dickinson <lede@cshore.thecshore.com>
+  MAINTAINER:=Daniel Dickinson <cshored@thecshore.com>
   USERID:=git=382:git=382
 endef
 
diff --git a/net/nut/Makefile b/net/nut/Makefile
index eb4bd228c..850c4a9fa 100644
--- a/net/nut/Makefile
+++ b/net/nut/Makefile
@@ -14,7 +14,7 @@ PKG_RELEASE:=6
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=http://www.networkupstools.org/source/2.7/
 PKG_HASH:=980e82918c52d364605c0703a5dcf01f74ad2ef06e3d365949e43b7d406d25a7
-PKG_MAINTAINER:=Daniel Dickinson <lede@cshore.thecshore.com>
+PKG_MAINTAINER:=Daniel Dickinson <cshored@thecshore.com>
 PKG_LICENSE:=GPL-2.0
 PKG_LICENSE_FILES:=LICENSE-GPL2
 PKG_FIXUP:=autoreconf
diff --git a/net/rp-pppoe/Makefile b/net/rp-pppoe/Makefile
index 8b11cea54..8b83698d9 100644
--- a/net/rp-pppoe/Makefile
+++ b/net/rp-pppoe/Makefile
@@ -10,7 +10,6 @@ include $(TOPDIR)/rules.mk
 PKG_NAME:=rp-pppoe
 PKG_VERSION:=3.12
 PKG_RELEASE:=6
-PKG_MAINTAINER:=Daniel Dickinson <lede@cshore.thecshore.com>
 PKG_LICENSE:=LGPL-2.0+
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
diff --git a/utils/findutils/Makefile b/utils/findutils/Makefile
index 5376fb90e..cfb4ad800 100644
--- a/utils/findutils/Makefile
+++ b/utils/findutils/Makefile
@@ -13,7 +13,6 @@ PKG_RELEASE:=1
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=@GNU/$(PKG_NAME)
 PKG_HASH:=ded4c9f73731cd48fec3b6bdaccce896473b6d8e337e9612e16cf1431bb1169d
-PKG_MAINTAINER:=Daniel Dickinson <lede@daniel.thecshore.com>
 
 PKG_BUILD_PARALLEL:=1
 PKG_INSTALL:=1
diff --git a/utils/gnupg/Makefile b/utils/gnupg/Makefile
index 3af691e99..f674774bf 100644
--- a/utils/gnupg/Makefile
+++ b/utils/gnupg/Makefile
@@ -17,7 +17,6 @@ PKG_HASH:=c9462f17e651b6507848c08c430c791287cd75491f8b5a8b50c6ed46b12678ba
 
 PKG_LICENSE:=GPL-3.0
 PKG_LICENSE_FILES:=COPYING
-PKG_MAINTAINER:=Daniel Dickinson <lede@cshore.thecshore.com>
 
 PKG_INSTALL:=1