From 7eeb254cc49c4e9f837c980826ec112b9404f341 Mon Sep 17 00:00:00 2001
From: Felix Fietkau <nbd@nbd.name>
Date: Tue, 7 Jun 2016 08:58:31 +0200
Subject: [PATCH] treewide: replace nbd@openwrt.org with nbd@nbd.name

Signed-off-by: Felix Fietkau <nbd@nbd.name>
---
 ...tchlib-add-driver-for-REALTEK-RTL8306.patch |  2 +-
 package/devel/binutils/Makefile                |  2 +-
 package/devel/perf/Makefile                    |  2 +-
 package/devel/strace/Makefile                  |  2 +-
 package/devel/valgrind/Makefile                |  2 +-
 package/firmware/ath10k-firmware/Makefile      |  2 +-
 package/firmware/linux-firmware/Makefile       |  2 +-
 package/kernel/avila-wdt/src/avila-wdt.c       |  4 ++--
 package/kernel/broadcom-wl/src/wlc.c           |  2 +-
 .../kernel/button-hotplug/src/button-hotplug.c |  2 +-
 .../src/gpio-button-hotplug.c                  |  6 +++---
 package/kernel/mac80211/Makefile               |  4 ++--
 ...th9k-force-rx_clear-when-disabling-rx.patch |  4 ++--
 ...retries-for-powersave-response-frames.patch |  4 ++--
 .../patches/548-ath9k_enable_gpio_chip.patch   |  2 +-
 .../549-ath9k_enable_gpio_buttons.patch        |  2 +-
 package/kernel/mt76/Makefile                   |  2 +-
 package/kernel/trelay/src/trelay.c             |  2 +-
 package/libs/libconfig/Makefile                |  2 +-
 package/libs/libjson-c/Makefile                |  2 +-
 package/libs/libnl-tiny/Makefile               |  2 +-
 package/libs/libpcap/Makefile                  |  2 +-
 package/libs/libroxml/Makefile                 |  2 +-
 package/libs/librpc/Makefile                   |  2 +-
 package/libs/libubox/Makefile                  |  2 +-
 package/libs/libusb-compat/Makefile            |  2 +-
 package/libs/libusb/Makefile                   |  2 +-
 package/libs/toolchain/Makefile                |  2 +-
 package/libs/uclient/Makefile                  |  2 +-
 package/libs/ustream-ssl/Makefile              |  2 +-
 package/network/config/netifd/Makefile         |  2 +-
 package/network/config/qos-scripts/Makefile    |  2 +-
 package/network/config/swconfig/Makefile       |  2 +-
 package/network/config/swconfig/src/cli.c      |  2 +-
 package/network/config/swconfig/src/swlib.c    |  2 +-
 package/network/config/swconfig/src/swlib.h    |  2 +-
 package/network/config/swconfig/src/uci.c      |  2 +-
 package/network/services/authsae/Makefile      |  2 +-
 package/network/services/ead/Makefile          |  2 +-
 package/network/services/ead/src/ead-client.c  |  2 +-
 package/network/services/ead/src/ead-crypt.c   |  2 +-
 package/network/services/ead/src/ead-crypt.h   |  2 +-
 package/network/services/ead/src/ead.c         |  2 +-
 package/network/services/ead/src/ead.h         |  2 +-
 package/network/services/ead/src/pfc.c         |  2 +-
 package/network/services/hostapd/Makefile      |  2 +-
 .../hostapd/patches/600-ubus_support.patch     |  4 ++--
 package/network/services/igmpproxy/Makefile    |  2 +-
 package/network/services/ppp/Makefile          |  2 +-
 package/network/services/relayd/Makefile       |  2 +-
 package/network/services/samba36/Makefile      |  2 +-
 .../samba36/patches/111-owrt_smbpasswd.patch   |  2 +-
 package/network/services/uhttpd/Makefile       |  2 +-
 package/network/utils/comgt/Makefile           |  2 +-
 package/network/utils/iperf/Makefile           |  2 +-
 package/network/utils/iperf3/Makefile          |  2 +-
 package/network/utils/iw/Makefile              |  2 +-
 package/network/utils/tcpdump/Makefile         |  2 +-
 package/network/utils/wireless-tools/Makefile  |  2 +-
 package/system/mtd/src/fis.c                   |  2 +-
 package/system/mtd/src/imagetag.c              |  2 +-
 package/system/mtd/src/jffs2.c                 |  2 +-
 package/system/mtd/src/mtd.c                   |  2 +-
 package/system/mtd/src/seama.c                 |  2 +-
 package/system/mtd/src/trx.c                   |  2 +-
 package/system/ubus/Makefile                   |  2 +-
 package/system/uci/Makefile                    |  2 +-
 package/system/uci/files/lib/config/uci.sh     |  2 +-
 package/system/usign/Makefile                  |  2 +-
 package/utils/busybox/Makefile                 |  2 +-
 ...uninitialized-memory-when-displaying-.patch |  4 ++--
 ...proute-fix-displaying-route-table-for.patch |  4 ++--
 .../busybox/patches/210-add_netmsg_util.patch  |  2 +-
 .../busybox/patches/220-add_lock_util.patch    |  2 +-
 package/utils/mdadm/Makefile                   |  2 +-
 package/utils/px5g/px5g.c                      |  2 +-
 package/utils/usbmode/Makefile                 |  2 +-
 package/utils/usbutils/Makefile                |  2 +-
 scripts/kconfig.pl                             |  2 +-
 .../files-3.18/arch/mips/adm8668/prom.c        |  2 +-
 .../files-3.18/drivers/mtd/maps/adm8668.c      |  2 +-
 .../ar71xx/files/arch/mips/ath79/mach-pb92.c   |  2 +-
 .../files/arch/mips/ath79/mach-wzr-hp-ag300h.c |  2 +-
 .../arch/mips/ath79/mach-wzr-hp-g300nh2.c      |  2 +-
 .../files/arch/mips/ath79/mach-wzr-hp-g450h.c  |  2 +-
 .../ar71xx/files/drivers/mtd/cybertan_part.c   |  2 +-
 .../ethernet/atheros/ag71xx/ag71xx_ar7240.c    |  2 +-
 .../ath25/patches-4.4/107-ar5312_gpio.patch    |  2 +-
 .../ath25/patches-4.4/108-ar2315_gpio.patch    |  2 +-
 .../patches-4.4/110-ar2313_ethernet.patch      |  6 +++---
 .../linux/ath25/patches-4.4/120-spiflash.patch |  4 ++--
 .../ath25/patches-4.4/210-reset_button.patch   |  2 +-
 .../drivers/firmware/broadcom/bcm47xx_sprom.c  |  2 +-
 ...-power-button-for-Buffalo-WZR-1750DHP.patch |  4 ++--
 .../patches-4.1/820-wgt634u-nvram-fix.patch    |  2 +-
 .../patches-4.4/820-wgt634u-nvram-fix.patch    |  2 +-
 target/linux/cns3xxx/Makefile                  |  2 +-
 .../files/drivers/mtd/mtdsplit/mtdsplit.c      |  2 +-
 .../files/drivers/mtd/mtdsplit/mtdsplit.h      |  2 +-
 .../drivers/mtd/mtdsplit/mtdsplit_squashfs.c   |  2 +-
 .../drivers/mtd/mtdsplit/mtdsplit_tplink.c     |  2 +-
 .../files/drivers/mtd/mtdsplit/mtdsplit_trx.c  |  2 +-
 .../generic/files/drivers/net/phy/adm6996.c    |  2 +-
 .../generic/files/drivers/net/phy/adm6996.h    |  2 +-
 .../generic/files/drivers/net/phy/ar8216.c     |  2 +-
 .../generic/files/drivers/net/phy/ar8216.h     |  2 +-
 .../generic/files/drivers/net/phy/ar8327.c     |  2 +-
 .../generic/files/drivers/net/phy/ar8327.h     |  2 +-
 .../generic/files/drivers/net/phy/ip17xx.c     |  4 ++--
 .../generic/files/drivers/net/phy/mvsw61xx.c   |  2 +-
 .../generic/files/drivers/net/phy/mvsw61xx.h   |  2 +-
 .../generic/files/drivers/net/phy/mvswitch.c   |  2 +-
 .../generic/files/drivers/net/phy/mvswitch.h   |  2 +-
 .../generic/files/drivers/net/phy/rtl8306.c    |  2 +-
 .../generic/files/drivers/net/phy/swconfig.c   |  4 ++--
 .../linux/generic/files/include/linux/switch.h |  2 +-
 .../generic/files/include/uapi/linux/switch.h  |  2 +-
 target/linux/generic/image/relocate/Makefile   |  2 +-
 target/linux/generic/image/relocate/head.S     |  2 +-
 ...escriptor-frame-start-end-definitions.patch |  4 ++--
 ...bgmac-implement-GRO-and-use-build_skb.patch |  4 ++--
 ...gmac-implement-scatter-gather-support.patch |  4 ++--
 ...bgmac-simplify-tx-ring-index-handling.patch |  4 ++--
 ...errupts-disabled-as-long-as-there-is-.patch |  4 ++--
 ...-received-skb-headroom-to-NET_SKB_PAD.patch |  4 ++--
 ...-bgmac-simplify-rx-DMA-error-handling.patch |  4 ++--
 ...bgmac-add-check-for-oversized-packets.patch |  4 ++--
 ...increase-rx-ring-size-from-511-to-512.patch |  4 ++--
 ...77-10-bgmac-simplify-dma-init-cleanup.patch |  4 ++--
 .../077-11-bgmac-fix-DMA-rx-corruption.patch   |  4 ++--
 .../077-12-bgmac-drop-ring-num_slots.patch     |  4 ++--
 ...-enable-Ethernet-core-before-using-it.patch |  2 +-
 ...-fix-MAC-soft-reset-bit-for-corerev-4.patch |  4 ++--
 ...ppoe-device-in-pppoe_unbind_sock_work.patch |  4 ++--
 ...name2-and-add-RENAME_WHITEOUT-support.patch |  4 ++--
 ...111-jffs2-add-RENAME_EXCHANGE-support.patch |  4 ++--
 ...dge_allow_receiption_on_disabled_port.patch |  2 +-
 .../patches-3.18/132-mips_inline_dma_ops.patch |  4 ++--
 .../patches-3.18/204-module_strip.patch        |  4 ++--
 .../generic/patches-3.18/220-gc_sections.patch |  4 ++--
 .../patches-3.18/307-mips_highmem_offset.patch |  2 +-
 .../patches-3.18/621-sched_act_connmark.patch  |  4 ++--
 .../patches-3.18/630-packet_socket_type.patch  |  2 +-
 .../640-bridge_no_eap_forward.patch            |  2 +-
 .../641-bridge_always_accept_eap.patch         |  2 +-
 .../patches-3.18/642-bridge_port_isolate.patch |  2 +-
 .../645-bridge_multicast_to_unicast.patch      |  2 +-
 ...ET-skip-GRO-for-foreign-MAC-addresses.patch |  2 +-
 .../generic/patches-3.18/930-crashlog.patch    |  2 +-
 ...-fix-MAC-soft-reset-bit-for-corerev-4.patch |  4 ++--
 ...-bgmac-reset-all-4-GMAC-cores-on-init.patch |  4 ++--
 .../103-packet_allow_empty_payload.patch       |  2 +-
 ...name2-and-add-RENAME_WHITEOUT-support.patch |  4 ++--
 ...111-jffs2-add-RENAME_EXCHANGE-support.patch |  4 ++--
 ...dge_allow_receiption_on_disabled_port.patch |  2 +-
 .../patches-4.1/132-mips_inline_dma_ops.patch  |  4 ++--
 ...nor-disable-protection-for-Winbond-fl.patch |  4 ++--
 .../generic/patches-4.1/204-module_strip.patch |  4 ++--
 .../generic/patches-4.1/220-gc_sections.patch  |  4 ++--
 .../patches-4.1/307-mips_highmem_offset.patch  |  2 +-
 ...m25p80-mx-disable-software-protection.patch |  2 +-
 .../patches-4.1/630-packet_socket_type.patch   |  2 +-
 .../640-bridge_no_eap_forward.patch            |  2 +-
 .../641-bridge_always_accept_eap.patch         |  2 +-
 .../patches-4.1/642-bridge_port_isolate.patch  |  2 +-
 .../645-bridge_multicast_to_unicast.patch      |  2 +-
 ...ET-skip-GRO-for-foreign-MAC-addresses.patch |  2 +-
 .../generic/patches-4.1/930-crashlog.patch     |  2 +-
 ...rdcode-path-to-awk-in-scripts-ld-vers.patch |  4 ++--
 ...-enable-Ethernet-core-before-using-it.patch |  2 +-
 ...-fix-MAC-soft-reset-bit-for-corerev-4.patch |  4 ++--
 ...-fix-cache-flushing-for-highmem-pages.patch |  4 ++--
 ...name2-and-add-RENAME_WHITEOUT-support.patch |  4 ++--
 ...111-jffs2-add-RENAME_EXCHANGE-support.patch |  4 ++--
 ...dge_allow_receiption_on_disabled_port.patch |  2 +-
 .../patches-4.4/132-mips_inline_dma_ops.patch  |  4 ++--
 .../generic/patches-4.4/204-module_strip.patch |  4 ++--
 .../patches-4.4/206-mips-disable-vdso.patch    |  2 +-
 .../generic/patches-4.4/220-gc_sections.patch  |  4 ++--
 .../patches-4.4/307-mips_highmem_offset.patch  |  2 +-
 ...m25p80-mx-disable-software-protection.patch |  2 +-
 .../patches-4.4/630-packet_socket_type.patch   |  2 +-
 .../640-bridge_no_eap_forward.patch            |  2 +-
 .../641-bridge_always_accept_eap.patch         |  2 +-
 .../patches-4.4/642-bridge_port_isolate.patch  |  2 +-
 .../645-bridge_multicast_to_unicast.patch      |  2 +-
 ...ET-skip-GRO-for-foreign-MAC-addresses.patch |  2 +-
 .../681-NET-add-of_get_mac_address_mtd.patch   |  2 +-
 .../generic/patches-4.4/930-crashlog.patch     |  2 +-
 .../ipq806x/patches-4.4/400-dsa-add-qca.patch  | 18 +++++++++---------
 ...iatek-add-support-for-MT7623-ethernet.patch |  6 +++---
 ...-mediatek-add-an-entry-to-MAINTAINERS.patch |  4 ++--
 ...next-mediatek-change-my-email-address.patch |  2 +-
 ...9-MAINTAINERS-change-my-email-address.patch |  2 +-
 ...-Sean-as-mediatek-ethernet-maintainer.patch |  2 +-
 ...01-net-mediatek-add-gsw-mt7530-driver.patch |  4 ++--
 ...spi-fsl-espi-preallocate-local-buffer.patch |  2 +-
 ...link-add-mt7621-cpu-feature-overrides.patch |  2 +-
 .../0043-spi-add-mt7621-support.patch          |  4 ++--
 ...T-net-add-docs-for-ralink-mediatek-So.patch |  2 +-
 ...t-mediatek-add-the-drivers-core-files.patch | 14 +++++++-------
 ...mediatek-add-switch-driver-for-rt3050.patch |  4 ++--
 ...mediatek-add-switch-driver-for-mt7620.patch |  4 ++--
 ...mediatek-add-switch-driver-for-mt7621.patch |  2 +-
 ...-next-mediatek-add-support-for-rt2880.patch |  8 ++++----
 ...-next-mediatek-add-support-for-rt3050.patch |  4 ++--
 ...-next-mediatek-add-support-for-rt3883.patch |  4 ++--
 ...-next-mediatek-add-support-for-mt7620.patch |  6 +++---
 ...-next-mediatek-add-support-for-mt7621.patch |  4 ++--
 ...ext-mediatek-add-Kconfig-and-Makefile.patch |  2 +-
 ...t-rt3050-ethernet-ports-to-be-disable.patch |  2 +-
 target/linux/rb532/src/patch-cmdline.c         |  2 +-
 target/linux/x86/Makefile                      |  2 +-
 toolchain/gcc/common.mk                        |  2 +-
 .../patches/001-update-to-git-2016-03-06.patch |  2 +-
 tools/firmware-utils/src/nand_ecc.c            |  2 +-
 tools/firmware-utils/src/ptgen.c               |  2 +-
 tools/patch-image/src/patch-cmdline.c          |  2 +-
 tools/patch-image/src/patch-dtb.c              |  2 +-
 219 files changed, 299 insertions(+), 299 deletions(-)

diff --git a/package/boot/uboot-lantiq/patches/0013-net-switchlib-add-driver-for-REALTEK-RTL8306.patch b/package/boot/uboot-lantiq/patches/0013-net-switchlib-add-driver-for-REALTEK-RTL8306.patch
index 4c01ad024a6..72b885aea65 100644
--- a/package/boot/uboot-lantiq/patches/0013-net-switchlib-add-driver-for-REALTEK-RTL8306.patch
+++ b/package/boot/uboot-lantiq/patches/0013-net-switchlib-add-driver-for-REALTEK-RTL8306.patch
@@ -23,7 +23,7 @@ Signed-off-by: Daniel Schwierzeck <daniel.schwierzeck@gmail.com>
 + * Based on OpenWrt linux driver
 + *
 + * Copyright (C) 2011-2012 Daniel Schwierzeck, daniel.schwierzeck@gmail.com
-+ * Copyright (C) 2009 Felix Fietkau <nbd@openwrt.org>
++ * Copyright (C) 2009 Felix Fietkau <nbd@nbd.name>
 + *
 + * SPDX-License-Identifier:	GPL-2.0+
 + */
diff --git a/package/devel/binutils/Makefile b/package/devel/binutils/Makefile
index 79f5dcc17a3..84e023a0885 100644
--- a/package/devel/binutils/Makefile
+++ b/package/devel/binutils/Makefile
@@ -21,7 +21,7 @@ PKG_LIBTOOL_PATHS:=. gas bfd opcodes gprof binutils ld libiberty gold intl
 PKG_REMOVE_FILES:=libtool.m4
 PKG_INSTALL:=1
 
-PKG_MAINTAINER:=Felix Fietkau <nbd@openwrt.org>
+PKG_MAINTAINER:=Felix Fietkau <nbd@nbd.name>
 PKG_LICENSE:=GPL-3.0+
 PKG_BUILD_PARALLEL:=1
 PKG_USE_MIPS16:=0
diff --git a/package/devel/perf/Makefile b/package/devel/perf/Makefile
index 026def2323d..0ec2bba3e2d 100644
--- a/package/devel/perf/Makefile
+++ b/package/devel/perf/Makefile
@@ -14,7 +14,7 @@ PKG_RELEASE:=2
 
 PKG_USE_MIPS16:=0
 PKG_BUILD_PARALLEL:=1
-PKG_MAINTAINER:=Felix Fietkau <nbd@openwrt.org>
+PKG_MAINTAINER:=Felix Fietkau <nbd@nbd.name>
 
 # Perf's makefile and headers are not relocatable and must be built from the
 # Linux sources directory
diff --git a/package/devel/strace/Makefile b/package/devel/strace/Makefile
index 381cc9df677..8a0d2e8fb30 100644
--- a/package/devel/strace/Makefile
+++ b/package/devel/strace/Makefile
@@ -20,7 +20,7 @@ PKG_SOURCE_URL:=@SF/$(PKG_NAME)
 PKG_LICENSE:=BSD-3c
 PKG_LICENSE_FILES:=COPYRIGHT
 
-PKG_MAINTAINER:=Felix Fietkau <nbd@openwrt.org>
+PKG_MAINTAINER:=Felix Fietkau <nbd@nbd.name>
 
 PKG_FIXUP:=autoreconf
 PKG_INSTALL:=1
diff --git a/package/devel/valgrind/Makefile b/package/devel/valgrind/Makefile
index 3abed9c739d..6a576a24d00 100644
--- a/package/devel/valgrind/Makefile
+++ b/package/devel/valgrind/Makefile
@@ -15,7 +15,7 @@ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
 PKG_SOURCE_URL:=http://valgrind.org/downloads/
 PKG_MD5SUM:=60ddae962bc79e7c95cfc4667245707f
 
-PKG_MAINTAINER:=Felix Fietkau <nbd@openwrt.org>
+PKG_MAINTAINER:=Felix Fietkau <nbd@nbd.name>
 PKG_LICENSE:=GPL-2.0+
 
 PKG_FIXUP = autoreconf
diff --git a/package/firmware/ath10k-firmware/Makefile b/package/firmware/ath10k-firmware/Makefile
index 4ea41c4c351..3a7302a48ff 100644
--- a/package/firmware/ath10k-firmware/Makefile
+++ b/package/firmware/ath10k-firmware/Makefile
@@ -17,7 +17,7 @@ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
 PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
 PKG_SOURCE_URL:=https://github.com/kvalo/ath10k-firmware.git
 
-PKG_MAINTAINER:=Felix Fietkau <nbd@openwrt.org>
+PKG_MAINTAINER:=Felix Fietkau <nbd@nbd.name>
 
 include $(INCLUDE_DIR)/package.mk
 
diff --git a/package/firmware/linux-firmware/Makefile b/package/firmware/linux-firmware/Makefile
index 2fcd93b2ef1..e1e1a47219e 100644
--- a/package/firmware/linux-firmware/Makefile
+++ b/package/firmware/linux-firmware/Makefile
@@ -19,7 +19,7 @@ PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_SOURCE_SUBDIR)
 PKG_SOURCE_URL:=git://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git
 PKG_MIRROR_MD5SUM:=ca4d289ad9380471cae376fc7dd3660a
 
-PKG_MAINTAINER:=Felix Fietkau <nbd@openwrt.org>
+PKG_MAINTAINER:=Felix Fietkau <nbd@nbd.name>
 
 SCAN_DEPS = *.mk
 
diff --git a/package/kernel/avila-wdt/src/avila-wdt.c b/package/kernel/avila-wdt/src/avila-wdt.c
index 981f3857ad1..22a3d6c7eaf 100644
--- a/package/kernel/avila-wdt/src/avila-wdt.c
+++ b/package/kernel/avila-wdt/src/avila-wdt.c
@@ -1,6 +1,6 @@
 /*
  * avila-wdt.c 
- * Copyright (C) 2009 Felix Fietkau <nbd@openwrt.org>
+ * Copyright (C) 2009 Felix Fietkau <nbd@nbd.name>
  *
  * based on:
  * drivers/char/watchdog/ixp4xx_wdt.c
@@ -217,7 +217,7 @@ static void __exit avila_wdt_exit(void)
 module_init(avila_wdt_init);
 module_exit(avila_wdt_exit);
 
-MODULE_AUTHOR("Felix Fietkau <nbd@openwrt.org>");
+MODULE_AUTHOR("Felix Fietkau <nbd@nbd.name>");
 MODULE_DESCRIPTION("Gateworks Avila Hardware Watchdog");
 
 module_param(heartbeat, int, 0);
diff --git a/package/kernel/broadcom-wl/src/wlc.c b/package/kernel/broadcom-wl/src/wlc.c
index db48b736570..46ccf94bffd 100644
--- a/package/kernel/broadcom-wl/src/wlc.c
+++ b/package/kernel/broadcom-wl/src/wlc.c
@@ -1,7 +1,7 @@
 /*
  * wlc - Broadcom Wireless Driver Control Utility
  *
- * Copyright (C) 2006 Felix Fietkau <nbd@openwrt.org>
+ * Copyright (C) 2006 Felix Fietkau <nbd@nbd.name>
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
diff --git a/package/kernel/button-hotplug/src/button-hotplug.c b/package/kernel/button-hotplug/src/button-hotplug.c
index 41fdf3a2562..5294a9700df 100644
--- a/package/kernel/button-hotplug/src/button-hotplug.c
+++ b/package/kernel/button-hotplug/src/button-hotplug.c
@@ -5,7 +5,7 @@
  *
  *  Based on the diag.c - GPIO interface driver for Broadcom boards
  *    Copyright (C) 2006 Mike Baker <mbm@openwrt.org>,
- *    Copyright (C) 2006-2007 Felix Fietkau <nbd@openwrt.org>
+ *    Copyright (C) 2006-2007 Felix Fietkau <nbd@nbd.name>
  *    Copyright (C) 2008 Andy Boyett <agb@openwrt.org>
  *
  *  This program is free software; you can redistribute it and/or modify it
diff --git a/package/kernel/gpio-button-hotplug/src/gpio-button-hotplug.c b/package/kernel/gpio-button-hotplug/src/gpio-button-hotplug.c
index 0ebe6c55767..93fc047d08f 100644
--- a/package/kernel/gpio-button-hotplug/src/gpio-button-hotplug.c
+++ b/package/kernel/gpio-button-hotplug/src/gpio-button-hotplug.c
@@ -1,12 +1,12 @@
 /*
  *  GPIO Button Hotplug driver
  *
- *  Copyright (C) 2012 Felix Fietkau <nbd@openwrt.org>
+ *  Copyright (C) 2012 Felix Fietkau <nbd@nbd.name>
  *  Copyright (C) 2008-2010 Gabor Juhos <juhosg@openwrt.org>
  *
  *  Based on the diag.c - GPIO interface driver for Broadcom boards
  *    Copyright (C) 2006 Mike Baker <mbm@openwrt.org>,
- *    Copyright (C) 2006-2007 Felix Fietkau <nbd@openwrt.org>
+ *    Copyright (C) 2006-2007 Felix Fietkau <nbd@nbd.name>
  *    Copyright (C) 2008 Andy Boyett <agb@openwrt.org>
  *
  *  This program is free software; you can redistribute it and/or modify it
@@ -661,7 +661,7 @@ module_init(gpio_button_init);
 module_exit(gpio_button_exit);
 
 MODULE_AUTHOR("Gabor Juhos <juhosg@openwrt.org>");
-MODULE_AUTHOR("Felix Fietkau <nbd@openwrt.org>");
+MODULE_AUTHOR("Felix Fietkau <nbd@nbd.name>");
 MODULE_DESCRIPTION("Polled GPIO Buttons hotplug driver");
 MODULE_LICENSE("GPL v2");
 MODULE_ALIAS("platform:" DRV_NAME);
diff --git a/package/kernel/mac80211/Makefile b/package/kernel/mac80211/Makefile
index acd5e283dcb..bee07231aa1 100644
--- a/package/kernel/mac80211/Makefile
+++ b/package/kernel/mac80211/Makefile
@@ -20,7 +20,7 @@ PKG_SOURCE:=compat-wireless-$(PKG_VERSION)$(PKG_BACKPORT_VERSION).tar.bz2
 PKG_BUILD_DIR:=$(KERNEL_BUILD_DIR)/compat-wireless-$(PKG_VERSION)
 PKG_BUILD_PARALLEL:=1
 
-PKG_MAINTAINER:=Felix Fietkau <nbd@openwrt.org>
+PKG_MAINTAINER:=Felix Fietkau <nbd@nbd.name>
 
 PKG_DRIVERS = \
 	adm8211 \
@@ -80,7 +80,7 @@ WMENU:=Wireless Drivers
 define KernelPackage/mac80211/Default
   SUBMENU:=$(WMENU)
   URL:=https://wireless.wiki.kernel.org/
-  MAINTAINER:=Felix Fietkau <nbd@openwrt.org>
+  MAINTAINER:=Felix Fietkau <nbd@nbd.name>
 endef
 
 define KernelPackage/cfg80211
diff --git a/package/kernel/mac80211/patches/300-ath9k-force-rx_clear-when-disabling-rx.patch b/package/kernel/mac80211/patches/300-ath9k-force-rx_clear-when-disabling-rx.patch
index 9aa9d8bb134..8f7e8936c38 100644
--- a/package/kernel/mac80211/patches/300-ath9k-force-rx_clear-when-disabling-rx.patch
+++ b/package/kernel/mac80211/patches/300-ath9k-force-rx_clear-when-disabling-rx.patch
@@ -1,4 +1,4 @@
-From: Felix Fietkau <nbd@openwrt.org>
+From: Felix Fietkau <nbd@nbd.name>
 Date: Sun, 7 Jun 2015 13:53:35 +0200
 Subject: [PATCH] ath9k: force rx_clear when disabling rx
 
@@ -6,7 +6,7 @@ This makes stopping Rx more reliable and should reduce the frequency of
 Rx related DMA stop warnings. Don't use rx_clear in TX99 mode.
 
 Cc: stable@vger.kernel.org
-Signed-off-by: Felix Fietkau <nbd@openwrt.org>
+Signed-off-by: Felix Fietkau <nbd@nbd.name>
 Signed-off-by: Helmut Schaa <helmut.schaa@googlemail.com>
 ---
 
diff --git a/package/kernel/mac80211/patches/301-ath9k-limit-retries-for-powersave-response-frames.patch b/package/kernel/mac80211/patches/301-ath9k-limit-retries-for-powersave-response-frames.patch
index a160dc4f025..358d0280c54 100644
--- a/package/kernel/mac80211/patches/301-ath9k-limit-retries-for-powersave-response-frames.patch
+++ b/package/kernel/mac80211/patches/301-ath9k-limit-retries-for-powersave-response-frames.patch
@@ -1,4 +1,4 @@
-From: Felix Fietkau <nbd@openwrt.org>
+From: Felix Fietkau <nbd@nbd.name>
 Date: Thu, 2 Jul 2015 15:20:56 +0200
 Subject: [PATCH] ath9k: limit retries for powersave response frames
 
@@ -8,7 +8,7 @@ gone to sleep. To avoid wasting too much airtime on this, limit the
 number of retries on such frames and ensure that no sample rate gets
 used.
 
-Signed-off-by: Felix Fietkau <nbd@openwrt.org>
+Signed-off-by: Felix Fietkau <nbd@nbd.name>
 ---
 
 --- a/drivers/net/wireless/ath/ath9k/xmit.c
diff --git a/package/kernel/mac80211/patches/548-ath9k_enable_gpio_chip.patch b/package/kernel/mac80211/patches/548-ath9k_enable_gpio_chip.patch
index 0bc4fb3dd1d..1c89e42c7b3 100644
--- a/package/kernel/mac80211/patches/548-ath9k_enable_gpio_chip.patch
+++ b/package/kernel/mac80211/patches/548-ath9k_enable_gpio_chip.patch
@@ -6,7 +6,7 @@ Enable access to GPIO chip and its pins for Atheros AR92xx
 wireless devices. For now AR9285 and AR9287 are supported.
 
 Signed-off-by: Michal Cieslakiewicz <michal.cieslakiewicz@wp.pl>
-Signed-off-by: Felix Fietkau <nbd@openwrt.org>
+Signed-off-by: Felix Fietkau <nbd@nbd.name>
 ---
 --- a/drivers/net/wireless/ath/ath9k/ath9k.h
 +++ b/drivers/net/wireless/ath/ath9k/ath9k.h
diff --git a/package/kernel/mac80211/patches/549-ath9k_enable_gpio_buttons.patch b/package/kernel/mac80211/patches/549-ath9k_enable_gpio_buttons.patch
index 2e1623555fe..c7973bb039c 100644
--- a/package/kernel/mac80211/patches/549-ath9k_enable_gpio_buttons.patch
+++ b/package/kernel/mac80211/patches/549-ath9k_enable_gpio_buttons.patch
@@ -6,7 +6,7 @@ Key poller is activated for attached platform buttons.
 Requires ath9k GPIO chip access.
 
 Signed-off-by: Michal Cieslakiewicz <michal.cieslakiewicz@wp.pl>
-Signed-off-by: Felix Fietkau <nbd@openwrt.org>
+Signed-off-by: Felix Fietkau <nbd@nbd.name>
 ---
 --- a/drivers/net/wireless/ath/ath9k/ath9k.h
 +++ b/drivers/net/wireless/ath/ath9k/ath9k.h
diff --git a/package/kernel/mt76/Makefile b/package/kernel/mt76/Makefile
index 5807172757c..9e37a61fcba 100644
--- a/package/kernel/mt76/Makefile
+++ b/package/kernel/mt76/Makefile
@@ -13,7 +13,7 @@ PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
 PKG_SOURCE_VERSION:=810eef8383cf2669cd4354135fc560ccfe71786c
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.xz
 
-PKG_MAINTAINER:=Felix Fietkau <nbd@openwrt.org>
+PKG_MAINTAINER:=Felix Fietkau <nbd@nbd.name>
 PKG_BUILD_PARALLEL:=1
 
 STAMP_CONFIGURED_DEPENDS := $(STAGING_DIR)/usr/include/mac80211-backport/backport/autoconf.h
diff --git a/package/kernel/trelay/src/trelay.c b/package/kernel/trelay/src/trelay.c
index 8fa4374c06a..581a5cfd2fa 100644
--- a/package/kernel/trelay/src/trelay.c
+++ b/package/kernel/trelay/src/trelay.c
@@ -1,7 +1,7 @@
 /*
  * trelay.c: Trivial Ethernet Relay
  *
- * Copyright (C) 2012 Felix Fietkau <nbd@openwrt.org>
+ * Copyright (C) 2012 Felix Fietkau <nbd@nbd.name>
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
diff --git a/package/libs/libconfig/Makefile b/package/libs/libconfig/Makefile
index bbc0b04fba4..caa8fe54abe 100644
--- a/package/libs/libconfig/Makefile
+++ b/package/libs/libconfig/Makefile
@@ -18,7 +18,7 @@ PKG_MD5SUM:=b6ee0ce2b3ef844bad7cac2803a90634
 PKG_FIXUP:=autoreconf
 PKG_INSTALL:=1
 
-PKG_MAINTAINER:=Felix Fietkau <nbd@openwrt.org>
+PKG_MAINTAINER:=Felix Fietkau <nbd@nbd.name>
 PKG_LICENSE:=LGPL-2.1+
 
 include $(INCLUDE_DIR)/package.mk
diff --git a/package/libs/libjson-c/Makefile b/package/libs/libjson-c/Makefile
index 2b4c0a283eb..404a55d4175 100644
--- a/package/libs/libjson-c/Makefile
+++ b/package/libs/libjson-c/Makefile
@@ -21,7 +21,7 @@ PKG_LICENSE_FILES:=COPYING
 PKG_FIXUP:=autoreconf
 PKG_INSTALL:=1
 
-PKG_MAINTAINER:=Felix Fietkau <nbd@openwrt.org>
+PKG_MAINTAINER:=Felix Fietkau <nbd@nbd.name>
 
 include $(INCLUDE_DIR)/package.mk
 
diff --git a/package/libs/libnl-tiny/Makefile b/package/libs/libnl-tiny/Makefile
index 33a47582526..df5a7fd72e4 100644
--- a/package/libs/libnl-tiny/Makefile
+++ b/package/libs/libnl-tiny/Makefile
@@ -12,7 +12,7 @@ PKG_VERSION:=0.1
 PKG_RELEASE:=5
 
 PKG_LICENSE:=LGPL-2.1
-PKG_MAINTAINER:=Felix Fietkau <nbd@openwrt.org>
+PKG_MAINTAINER:=Felix Fietkau <nbd@nbd.name>
 
 include $(INCLUDE_DIR)/package.mk
 
diff --git a/package/libs/libpcap/Makefile b/package/libs/libpcap/Makefile
index 1011ce63497..08fab24fdee 100644
--- a/package/libs/libpcap/Makefile
+++ b/package/libs/libpcap/Makefile
@@ -16,7 +16,7 @@ PKG_SOURCE_URL:=http://www.tcpdump.org/release/
 PKG_MD5SUM:=b2e13142bbaba857ab1c6894aedaf547
 PKG_FIXUP:=patch-libtool
 
-PKG_MAINTAINER:=Felix Fietkau <nbd@openwrt.org>
+PKG_MAINTAINER:=Felix Fietkau <nbd@nbd.name>
 
 PKG_INSTALL:=1
 PKG_BUILD_PARALLEL:=1
diff --git a/package/libs/libroxml/Makefile b/package/libs/libroxml/Makefile
index 18a0d763e91..dcbe6104908 100644
--- a/package/libs/libroxml/Makefile
+++ b/package/libs/libroxml/Makefile
@@ -14,7 +14,7 @@ PKG_RELEASE:=2
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=http://download.libroxml.net/pool/v2.x
 PKG_MD5SUM:=a975f91be150f7a19168a45ce15769ca
-PKG_MAINTAINER:=Felix Fietkau <nbd@openwrt.org>
+PKG_MAINTAINER:=Felix Fietkau <nbd@nbd.name>
 
 PKG_INSTALL:=1
 PKG_BUILD_PARALLEL:=1
diff --git a/package/libs/librpc/Makefile b/package/libs/librpc/Makefile
index 8f0210fe146..d24cdd95d6a 100644
--- a/package/libs/librpc/Makefile
+++ b/package/libs/librpc/Makefile
@@ -15,7 +15,7 @@ PKG_USE_MIPS16:=0
 PKG_LICENSE:=LGPL-2.1
 PKG_LICENSE_FILES:=
 
-PKG_MAINTAINER:=Felix Fietkau <nbd@openwrt.org>
+PKG_MAINTAINER:=Felix Fietkau <nbd@nbd.name>
 
 include $(INCLUDE_DIR)/package.mk
 include $(INCLUDE_DIR)/cmake.mk
diff --git a/package/libs/libubox/Makefile b/package/libs/libubox/Makefile
index 84980557f50..97cac7bf5e8 100644
--- a/package/libs/libubox/Makefile
+++ b/package/libs/libubox/Makefile
@@ -15,7 +15,7 @@ CMAKE_INSTALL:=1
 PKG_LICENSE:=ISC
 PKG_LICENSE_FILES:=
 
-PKG_MAINTAINER:=Felix Fietkau <nbd@openwrt.org>
+PKG_MAINTAINER:=Felix Fietkau <nbd@nbd.name>
 
 PKG_BUILD_DEPENDS:=lua
 
diff --git a/package/libs/libusb-compat/Makefile b/package/libs/libusb-compat/Makefile
index c1cb58700bd..fe92c3fd6db 100644
--- a/package/libs/libusb-compat/Makefile
+++ b/package/libs/libusb-compat/Makefile
@@ -19,7 +19,7 @@ PKG_INSTALL:=1
 PKG_BUILD_PARALLEL:=1
 PKG_LICENSE:=LGPL-2.1
 
-PKG_MAINTAINER := Felix Fietkau <nbd@openwrt.org>
+PKG_MAINTAINER := Felix Fietkau <nbd@nbd.name>
 
 include $(INCLUDE_DIR)/package.mk
 
diff --git a/package/libs/libusb/Makefile b/package/libs/libusb/Makefile
index 192b8a0d04d..1b1edeef37f 100644
--- a/package/libs/libusb/Makefile
+++ b/package/libs/libusb/Makefile
@@ -19,7 +19,7 @@ PKG_INSTALL:=1
 PKG_BUILD_PARALLEL:=0
 PKG_LICENSE:=LGPL-2.1
 
-PKG_MAINTAINER := Felix Fietkau <nbd@openwrt.org>
+PKG_MAINTAINER := Felix Fietkau <nbd@nbd.name>
 
 include $(INCLUDE_DIR)/package.mk
 
diff --git a/package/libs/toolchain/Makefile b/package/libs/toolchain/Makefile
index b614db87a8e..75a3f355399 100644
--- a/package/libs/toolchain/Makefile
+++ b/package/libs/toolchain/Makefile
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 PKG_NAME:=toolchain
 PKG_RELEASE:=1
 
-PKG_MAINTAINER:=Felix Fietkau <nbd@openwrt.org>
+PKG_MAINTAINER:=Felix Fietkau <nbd@nbd.name>
 PKG_LICENSE:=GPL-3.0-with-GCC-exception
 
 PKG_FLAGS:=hold essential nonshared
diff --git a/package/libs/uclient/Makefile b/package/libs/uclient/Makefile
index ddcaf430aa7..58734aa18da 100644
--- a/package/libs/uclient/Makefile
+++ b/package/libs/uclient/Makefile
@@ -17,7 +17,7 @@ PKG_BUILD_DEPENDS:=ustream-ssl
 PKG_LICENSE:=ISC
 PKG_LICENSE_FILES:=
 
-PKG_MAINTAINER:=Felix Fietkau <nbd@openwrt.org>
+PKG_MAINTAINER:=Felix Fietkau <nbd@nbd.name>
 
 include $(INCLUDE_DIR)/package.mk
 include $(INCLUDE_DIR)/cmake.mk
diff --git a/package/libs/ustream-ssl/Makefile b/package/libs/ustream-ssl/Makefile
index 4a8a8d393d7..71264651aee 100644
--- a/package/libs/ustream-ssl/Makefile
+++ b/package/libs/ustream-ssl/Makefile
@@ -16,7 +16,7 @@ PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(BUILD_VARIANT)/$(PKG_SOURCE_SUBDIR)
 PKG_LICENSE:=ISC
 PKG_LICENSE_FILES:=
 
-PKG_MAINTAINER:=Felix Fietkau <nbd@openwrt.org>
+PKG_MAINTAINER:=Felix Fietkau <nbd@nbd.name>
 
 include $(INCLUDE_DIR)/package.mk
 include $(INCLUDE_DIR)/cmake.mk
diff --git a/package/network/config/netifd/Makefile b/package/network/config/netifd/Makefile
index 1660ad0c3da..82fcb3e48e8 100644
--- a/package/network/config/netifd/Makefile
+++ b/package/network/config/netifd/Makefile
@@ -9,7 +9,7 @@ PKG_SOURCE_URL=$(OPENWRT_GIT)/project/netifd.git
 PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
 PKG_SOURCE_VERSION:=99e6dc68bbac5a57a0ebca810a9dc36e38667821
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
-PKG_MAINTAINER:=Felix Fietkau <nbd@openwrt.org>
+PKG_MAINTAINER:=Felix Fietkau <nbd@nbd.name>
 # PKG_MIRROR_MD5SUM:=
 # CMAKE_INSTALL:=1
 
diff --git a/package/network/config/qos-scripts/Makefile b/package/network/config/qos-scripts/Makefile
index 288740b245b..1b43ba1d303 100644
--- a/package/network/config/qos-scripts/Makefile
+++ b/package/network/config/qos-scripts/Makefile
@@ -11,7 +11,7 @@ PKG_NAME:=qos-scripts
 PKG_VERSION:=1.3.0
 PKG_RELEASE:=1
 
-PKG_MAINTAINER:=Felix Fietkau <nbd@openwrt.org>
+PKG_MAINTAINER:=Felix Fietkau <nbd@nbd.name>
 
 PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME)
 
diff --git a/package/network/config/swconfig/Makefile b/package/network/config/swconfig/Makefile
index b62b059873b..2856742fcd0 100644
--- a/package/network/config/swconfig/Makefile
+++ b/package/network/config/swconfig/Makefile
@@ -10,7 +10,7 @@ include $(TOPDIR)/rules.mk
 PKG_NAME:=swconfig
 PKG_RELEASE:=10
 
-PKG_MAINTAINER:=Felix Fietkau <nbd@openwrt.org>
+PKG_MAINTAINER:=Felix Fietkau <nbd@nbd.name>
 PKG_LICENSE:=GPL-2.0
 
 include $(INCLUDE_DIR)/package.mk
diff --git a/package/network/config/swconfig/src/cli.c b/package/network/config/swconfig/src/cli.c
index 90554143e1a..331f3d5dac1 100644
--- a/package/network/config/swconfig/src/cli.c
+++ b/package/network/config/swconfig/src/cli.c
@@ -1,7 +1,7 @@
 /*
  * swconfig.c: Switch configuration utility
  *
- * Copyright (C) 2008 Felix Fietkau <nbd@openwrt.org>
+ * Copyright (C) 2008 Felix Fietkau <nbd@nbd.name>
  * Copyright (C) 2010 Martin Mares <mj@ucw.cz>
  *
  * This program is free software; you can redistribute it and/or
diff --git a/package/network/config/swconfig/src/swlib.c b/package/network/config/swconfig/src/swlib.c
index 9b675a924a8..e6e9aead474 100644
--- a/package/network/config/swconfig/src/swlib.c
+++ b/package/network/config/swconfig/src/swlib.c
@@ -1,7 +1,7 @@
 /*
  * swlib.c: Switch configuration API (user space part)
  *
- * Copyright (C) 2008 Felix Fietkau <nbd@openwrt.org>
+ * Copyright (C) 2008 Felix Fietkau <nbd@nbd.name>
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public License
diff --git a/package/network/config/swconfig/src/swlib.h b/package/network/config/swconfig/src/swlib.h
index f443bf5c265..3826a5e3402 100644
--- a/package/network/config/swconfig/src/swlib.h
+++ b/package/network/config/swconfig/src/swlib.h
@@ -1,7 +1,7 @@
 /*
  * swlib.h: Switch configuration API (user space part)
  *
- * Copyright (C) 2008-2009 Felix Fietkau <nbd@openwrt.org>
+ * Copyright (C) 2008-2009 Felix Fietkau <nbd@nbd.name>
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public License
diff --git a/package/network/config/swconfig/src/uci.c b/package/network/config/swconfig/src/uci.c
index bbeeb031119..b541b71646e 100644
--- a/package/network/config/swconfig/src/uci.c
+++ b/package/network/config/swconfig/src/uci.c
@@ -1,7 +1,7 @@
 /*
  * uci.c: UCI binding for the switch configuration utility
  *
- * Copyright (C) 2009 Felix Fietkau <nbd@openwrt.org>
+ * Copyright (C) 2009 Felix Fietkau <nbd@nbd.name>
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
diff --git a/package/network/services/authsae/Makefile b/package/network/services/authsae/Makefile
index 29550214fa7..d74cfef430b 100644
--- a/package/network/services/authsae/Makefile
+++ b/package/network/services/authsae/Makefile
@@ -22,7 +22,7 @@ CMAKE_INSTALL:=1
 
 CMAKE_OPTIONS += -DSYSCONF_INSTALL_DIR=/etc
 
-PKG_MAINTAINER:=Felix Fietkau <nbd@openwrt.org>
+PKG_MAINTAINER:=Felix Fietkau <nbd@nbd.name>
 PKG_LICENSE:=BSD-4-Clause
 
 include $(INCLUDE_DIR)/package.mk
diff --git a/package/network/services/ead/Makefile b/package/network/services/ead/Makefile
index bd33010d4e2..42e13d693af 100644
--- a/package/network/services/ead/Makefile
+++ b/package/network/services/ead/Makefile
@@ -13,7 +13,7 @@ PKG_RELEASE:=1
 PKG_BUILD_DEPENDS:=libpcap
 PKG_BUILD_DIR:=$(BUILD_DIR)/ead
 
-PKG_MAINTAINER:=Felix Fietkau <nbd@openwrt.org>
+PKG_MAINTAINER:=Felix Fietkau <nbd@nbd.name>
 PKG_LICENSE:=GPL-2.0
 
 include $(INCLUDE_DIR)/package.mk
diff --git a/package/network/services/ead/src/ead-client.c b/package/network/services/ead/src/ead-client.c
index 6d7e07dd446..35b67e3568f 100644
--- a/package/network/services/ead/src/ead-client.c
+++ b/package/network/services/ead/src/ead-client.c
@@ -1,6 +1,6 @@
 /*
  * Client for the Emergency Access Daemon
- * Copyright (C) 2008 Felix Fietkau <nbd@openwrt.org>
+ * Copyright (C) 2008 Felix Fietkau <nbd@nbd.name>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 2
diff --git a/package/network/services/ead/src/ead-crypt.c b/package/network/services/ead/src/ead-crypt.c
index 03721721d92..70d2b83b064 100644
--- a/package/network/services/ead/src/ead-crypt.c
+++ b/package/network/services/ead/src/ead-crypt.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2008 Felix Fietkau <nbd@openwrt.org>
+ * Copyright (C) 2008 Felix Fietkau <nbd@nbd.name>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 2
diff --git a/package/network/services/ead/src/ead-crypt.h b/package/network/services/ead/src/ead-crypt.h
index 831ec8a280c..2627d14162d 100644
--- a/package/network/services/ead/src/ead-crypt.h
+++ b/package/network/services/ead/src/ead-crypt.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2008 Felix Fietkau <nbd@openwrt.org>
+ * Copyright (C) 2008 Felix Fietkau <nbd@nbd.name>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 2
diff --git a/package/network/services/ead/src/ead.c b/package/network/services/ead/src/ead.c
index bded769b9d8..46a4625b6d4 100644
--- a/package/network/services/ead/src/ead.c
+++ b/package/network/services/ead/src/ead.c
@@ -1,6 +1,6 @@
 /*
  * Emergency Access Daemon
- * Copyright (C) 2008 Felix Fietkau <nbd@openwrt.org>
+ * Copyright (C) 2008 Felix Fietkau <nbd@nbd.name>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 2
diff --git a/package/network/services/ead/src/ead.h b/package/network/services/ead/src/ead.h
index 54505ce28c8..515ac21bdb1 100644
--- a/package/network/services/ead/src/ead.h
+++ b/package/network/services/ead/src/ead.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2008 Felix Fietkau <nbd@openwrt.org>
+ * Copyright (C) 2008 Felix Fietkau <nbd@nbd.name>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 2
diff --git a/package/network/services/ead/src/pfc.c b/package/network/services/ead/src/pfc.c
index 402e37f31d8..e53cbd1524b 100644
--- a/package/network/services/ead/src/pfc.c
+++ b/package/network/services/ead/src/pfc.c
@@ -1,6 +1,6 @@
 /*
  * Small pcap precompiler
- * Copyright (C) 2008 Felix Fietkau <nbd@openwrt.org>
+ * Copyright (C) 2008 Felix Fietkau <nbd@nbd.name>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 2
diff --git a/package/network/services/hostapd/Makefile b/package/network/services/hostapd/Makefile
index dba29dd1e30..d8435485800 100644
--- a/package/network/services/hostapd/Makefile
+++ b/package/network/services/hostapd/Makefile
@@ -18,7 +18,7 @@ PKG_SOURCE_VERSION:=$(PKG_REV)
 PKG_SOURCE_PROTO:=git
 # PKG_MIRROR_MD5SUM:=4e7c1f97edd7514535056fce54ae053a
 
-PKG_MAINTAINER:=Felix Fietkau <nbd@openwrt.org>
+PKG_MAINTAINER:=Felix Fietkau <nbd@nbd.name>
 PKG_LICENSE:=BSD-3-Clause
 
 PKG_BUILD_PARALLEL:=1
diff --git a/package/network/services/hostapd/patches/600-ubus_support.patch b/package/network/services/hostapd/patches/600-ubus_support.patch
index 0a61aeff869..d5767259b6f 100644
--- a/package/network/services/hostapd/patches/600-ubus_support.patch
+++ b/package/network/services/hostapd/patches/600-ubus_support.patch
@@ -44,7 +44,7 @@
 @@ -0,0 +1,536 @@
 +/*
 + * hostapd / ubus support
-+ * Copyright (c) 2013, Felix Fietkau <nbd@openwrt.org>
++ * Copyright (c) 2013, Felix Fietkau <nbd@nbd.name>
 + *
 + * This software may be distributed under the terms of the BSD license.
 + * See README for more details.
@@ -583,7 +583,7 @@
 @@ -0,0 +1,78 @@
 +/*
 + * hostapd / ubus support
-+ * Copyright (c) 2013, Felix Fietkau <nbd@openwrt.org>
++ * Copyright (c) 2013, Felix Fietkau <nbd@nbd.name>
 + *
 + * This software may be distributed under the terms of the BSD license.
 + * See README for more details.
diff --git a/package/network/services/igmpproxy/Makefile b/package/network/services/igmpproxy/Makefile
index 03ad25819b5..0ad85561c1d 100644
--- a/package/network/services/igmpproxy/Makefile
+++ b/package/network/services/igmpproxy/Makefile
@@ -14,7 +14,7 @@ PKG_RELEASE:=8
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=@SF/igmpproxy
 PKG_MD5SUM:=c56f41ec195bc1fe016369bf74efc5a1
-PKG_MAINTAINER:=Felix Fietkau <nbd@openwrt.org>
+PKG_MAINTAINER:=Felix Fietkau <nbd@nbd.name>
 
 include $(INCLUDE_DIR)/package.mk
 
diff --git a/package/network/services/ppp/Makefile b/package/network/services/ppp/Makefile
index 23c1e93c581..e3492ac55f7 100644
--- a/package/network/services/ppp/Makefile
+++ b/package/network/services/ppp/Makefile
@@ -15,7 +15,7 @@ PKG_RELEASE:=9
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=https://download.samba.org/pub/ppp/
 PKG_MD5SUM:=78818f40e6d33a1d1de68a1551f6595a
-PKG_MAINTAINER:=Felix Fietkau <nbd@openwrt.org>
+PKG_MAINTAINER:=Felix Fietkau <nbd@nbd.name>
 PKG_LICENSE:=BSD-4-Clause
 
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(BUILD_VARIANT)/$(PKG_NAME)-$(PKG_VERSION)
diff --git a/package/network/services/relayd/Makefile b/package/network/services/relayd/Makefile
index 9b89ca72ed6..937b98165e1 100644
--- a/package/network/services/relayd/Makefile
+++ b/package/network/services/relayd/Makefile
@@ -17,7 +17,7 @@ PKG_SOURCE_URL=$(OPENWRT_GIT)/project/relayd.git
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_VERSION:=ad0b25ad74345d367c62311e14b279f5ccb8ef13
 
-PKG_MAINTAINER:=Felix Fietkau <nbd@openwrt.org>
+PKG_MAINTAINER:=Felix Fietkau <nbd@nbd.name>
 PKG_LICENSE:=GPL-2.0
 
 include $(INCLUDE_DIR)/package.mk
diff --git a/package/network/services/samba36/Makefile b/package/network/services/samba36/Makefile
index 7b571a44108..fdbaa65a7be 100644
--- a/package/network/services/samba36/Makefile
+++ b/package/network/services/samba36/Makefile
@@ -19,7 +19,7 @@ PKG_MD5SUM:=76da2fa64edd94a0188531e7ecb27c4e
 PKG_LICENSE:=GPL-3.0
 PKG_LICENSE_FILES:=COPYING
 
-PKG_MAINTAINER:=Felix Fietkau <nbd@openwrt.org>
+PKG_MAINTAINER:=Felix Fietkau <nbd@nbd.name>
 
 PKG_BUILD_PARALLEL:=1
 
diff --git a/package/network/services/samba36/patches/111-owrt_smbpasswd.patch b/package/network/services/samba36/patches/111-owrt_smbpasswd.patch
index 25fde6de2ea..40b34e9a774 100644
--- a/package/network/services/samba36/patches/111-owrt_smbpasswd.patch
+++ b/package/network/services/samba36/patches/111-owrt_smbpasswd.patch
@@ -31,7 +31,7 @@
 +++ b/source3/utils/owrt_smbpasswd.c
 @@ -0,0 +1,249 @@
 +/*
-+ * Copyright (C) 2012 Felix Fietkau <nbd@openwrt.org>
++ * Copyright (C) 2012 Felix Fietkau <nbd@nbd.name>
 + * Copyright (C) 2008 John Crispin <blogic@openwrt.org>
 + *
 + * This program is free software; you can redistribute it and/or modify it
diff --git a/package/network/services/uhttpd/Makefile b/package/network/services/uhttpd/Makefile
index ab5ef64bb56..bc3b00edd53 100644
--- a/package/network/services/uhttpd/Makefile
+++ b/package/network/services/uhttpd/Makefile
@@ -16,7 +16,7 @@ PKG_SOURCE_URL=$(OPENWRT_GIT)/project/uhttpd.git
 PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
 PKG_SOURCE_VERSION:=fe01ef3f52adae9da38ef47926cd50974af5d6b7
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
-PKG_MAINTAINER:=Felix Fietkau <nbd@openwrt.org>
+PKG_MAINTAINER:=Felix Fietkau <nbd@nbd.name>
 PKG_LICENSE:=ISC
 
 PKG_BUILD_DEPENDS = ustream-ssl
diff --git a/package/network/utils/comgt/Makefile b/package/network/utils/comgt/Makefile
index ac19aad3aed..3a23fb05258 100644
--- a/package/network/utils/comgt/Makefile
+++ b/package/network/utils/comgt/Makefile
@@ -15,7 +15,7 @@ PKG_SOURCE:=$(PKG_NAME).$(PKG_VERSION).tgz
 PKG_SOURCE_URL:=@SF/comgt
 PKG_MD5SUM:=db2452680c3d953631299e331daf49ef
 
-PKG_MAINTAINER:=Felix Fietkau <nbd@openwrt.org>
+PKG_MAINTAINER:=Felix Fietkau <nbd@nbd.name>
 PKG_LICENSE:=GPL-2.0+
 
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME).$(PKG_VERSION)
diff --git a/package/network/utils/iperf/Makefile b/package/network/utils/iperf/Makefile
index 23832fa7850..cfd069ff543 100644
--- a/package/network/utils/iperf/Makefile
+++ b/package/network/utils/iperf/Makefile
@@ -16,7 +16,7 @@ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=@SF/iperf2
 PKG_MD5SUM:=e5887f799d8dc64a974c6c2f2e5cc339
 
-PKG_MAINTAINER:=Felix Fietkau <nbd@openwrt.org>
+PKG_MAINTAINER:=Felix Fietkau <nbd@nbd.name>
 PKG_LICENSE:=BSD-3-Clause
 
 PKG_BUILD_PARALLEL:=1
diff --git a/package/network/utils/iperf3/Makefile b/package/network/utils/iperf3/Makefile
index da9c0044c92..b534f290472 100644
--- a/package/network/utils/iperf3/Makefile
+++ b/package/network/utils/iperf3/Makefile
@@ -15,7 +15,7 @@ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=http://downloads.es.net/pub/iperf
 PKG_MD5SUM:=a3b2bed7961ba184566df3c3d47f96a6
 
-PKG_MAINTAINER:=Felix Fietkau <nbd@openwrt.org>
+PKG_MAINTAINER:=Felix Fietkau <nbd@nbd.name>
 PKG_LICENSE:=BSD-3-Clause
 
 PKG_BUILD_PARALLEL:=1
diff --git a/package/network/utils/iw/Makefile b/package/network/utils/iw/Makefile
index 7c1a429defc..d17cbca0df3 100644
--- a/package/network/utils/iw/Makefile
+++ b/package/network/utils/iw/Makefile
@@ -15,7 +15,7 @@ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
 PKG_SOURCE_URL:=@KERNEL/software/network/iw
 PKG_MD5SUM:=7adec72e91ebdd9c55429fa34a23a6f5
 
-PKG_MAINTAINER:=Felix Fietkau <nbd@openwrt.org>
+PKG_MAINTAINER:=Felix Fietkau <nbd@nbd.name>
 PKG_LICENSE:=GPL-2.0
 
 include $(INCLUDE_DIR)/package.mk
diff --git a/package/network/utils/tcpdump/Makefile b/package/network/utils/tcpdump/Makefile
index 8e33a2bb7b0..d0a05e0618f 100644
--- a/package/network/utils/tcpdump/Makefile
+++ b/package/network/utils/tcpdump/Makefile
@@ -21,7 +21,7 @@ PKG_MD5SUM:=973a2513d0076e34aa9da7e15ed98e1b
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(BUILD_VARIANT)/$(PKG_NAME)-$(PKG_VERSION)
 PKG_BUILD_PARALLEL:=1
 
-PKG_MAINTAINER:=Felix Fietkau <nbd@openwrt.org>
+PKG_MAINTAINER:=Felix Fietkau <nbd@nbd.name>
 PKG_LICENSE:=BSD-3-Clause
 
 PKG_INSTALL:=1
diff --git a/package/network/utils/wireless-tools/Makefile b/package/network/utils/wireless-tools/Makefile
index 67986baaa16..df7f6be9d6e 100644
--- a/package/network/utils/wireless-tools/Makefile
+++ b/package/network/utils/wireless-tools/Makefile
@@ -17,7 +17,7 @@ PKG_SOURCE_URL:=http://www.hpl.hp.com/personal/Jean_Tourrilhes/Linux
 PKG_MD5SUM:=e06c222e186f7cc013fd272d023710cb
 TAR_OPTIONS += || true
 
-PKG_MAINTAINER:=Felix Fietkau <nbd@openwrt.org>
+PKG_MAINTAINER:=Felix Fietkau <nbd@nbd.name>
 PKG_LICENSE:=GPL-2.0
 
 PKG_BUILD_DIR:=$(BUILD_DIR)/wireless_tools.$(PKG_VERSION)
diff --git a/package/system/mtd/src/fis.c b/package/system/mtd/src/fis.c
index f825f590c96..b50411cfebb 100644
--- a/package/system/mtd/src/fis.c
+++ b/package/system/mtd/src/fis.c
@@ -1,7 +1,7 @@
 /*
  * FIS table updating code for mtd
  *
- * Copyright (C) 2009 Felix Fietkau <nbd@openwrt.org>
+ * Copyright (C) 2009 Felix Fietkau <nbd@nbd.name>
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License v2
diff --git a/package/system/mtd/src/imagetag.c b/package/system/mtd/src/imagetag.c
index 2ad207660c7..673dd44de56 100644
--- a/package/system/mtd/src/imagetag.c
+++ b/package/system/mtd/src/imagetag.c
@@ -2,7 +2,7 @@
  * imagetag.c
  *
  * Copyright (C) 2005 Mike Baker
- * Copyright (C) 2008 Felix Fietkau <nbd@openwrt.org>
+ * Copyright (C) 2008 Felix Fietkau <nbd@nbd.name>
  * Copyrigth (C) 2010 Daniel Dickinson <openwrt@cshore.neomailbox.net>
  *
  * This program is free software; you can redistribute it and/or
diff --git a/package/system/mtd/src/jffs2.c b/package/system/mtd/src/jffs2.c
index c29fb33e5cb..b432f64ac05 100644
--- a/package/system/mtd/src/jffs2.c
+++ b/package/system/mtd/src/jffs2.c
@@ -1,7 +1,7 @@
 /*
  * jffs2 on-disk structure generator for mtd
  *
- * Copyright (C) 2008 Felix Fietkau <nbd@openwrt.org>
+ * Copyright (C) 2008 Felix Fietkau <nbd@nbd.name>
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License v2
diff --git a/package/system/mtd/src/mtd.c b/package/system/mtd/src/mtd.c
index a8464947f35..af544198cbe 100644
--- a/package/system/mtd/src/mtd.c
+++ b/package/system/mtd/src/mtd.c
@@ -2,7 +2,7 @@
  * mtd - simple memory technology device manipulation tool
  *
  * Copyright (C) 2005      Waldemar Brodkorb <wbx@dass-it.de>,
- * Copyright (C) 2005-2009 Felix Fietkau <nbd@openwrt.org>
+ * Copyright (C) 2005-2009 Felix Fietkau <nbd@nbd.name>
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License v2
diff --git a/package/system/mtd/src/seama.c b/package/system/mtd/src/seama.c
index ab24f036635..f8b677b1897 100644
--- a/package/system/mtd/src/seama.c
+++ b/package/system/mtd/src/seama.c
@@ -5,7 +5,7 @@
  *
  * Based on the trx fixup code:
  *   Copyright (C) 2005 Mike Baker
- *   Copyright (C) 2008 Felix Fietkau <nbd@openwrt.org>
+ *   Copyright (C) 2008 Felix Fietkau <nbd@nbd.name>
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
diff --git a/package/system/mtd/src/trx.c b/package/system/mtd/src/trx.c
index 816f0eba5f0..360a1271e3b 100644
--- a/package/system/mtd/src/trx.c
+++ b/package/system/mtd/src/trx.c
@@ -2,7 +2,7 @@
  * trx.c
  *
  * Copyright (C) 2005 Mike Baker
- * Copyright (C) 2008 Felix Fietkau <nbd@openwrt.org>
+ * Copyright (C) 2008 Felix Fietkau <nbd@nbd.name>
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
diff --git a/package/system/ubus/Makefile b/package/system/ubus/Makefile
index 3f66e0b1a16..51356706ac6 100644
--- a/package/system/ubus/Makefile
+++ b/package/system/ubus/Makefile
@@ -15,7 +15,7 @@ CMAKE_INSTALL:=1
 PKG_LICENSE:=LGPL-2.1
 PKG_LICENSE_FILES:=
 
-PKG_MAINTAINER:=Felix Fietkau <nbd@openwrt.org>
+PKG_MAINTAINER:=Felix Fietkau <nbd@nbd.name>
 
 include $(INCLUDE_DIR)/package.mk
 include $(INCLUDE_DIR)/cmake.mk
diff --git a/package/system/uci/Makefile b/package/system/uci/Makefile
index e48d5b454c4..ae6104fac42 100644
--- a/package/system/uci/Makefile
+++ b/package/system/uci/Makefile
@@ -25,7 +25,7 @@ PKG_SOURCE_PROTO:=git
 PKG_LICENSE:=LGPL-2.1
 PKG_LICENSE_FILES:=
 
-PKG_MAINTAINER:=Felix Fietkau <nbd@openwrt.org>
+PKG_MAINTAINER:=Felix Fietkau <nbd@nbd.name>
 
 PKG_BUILD_PARALLEL:=0
 
diff --git a/package/system/uci/files/lib/config/uci.sh b/package/system/uci/files/lib/config/uci.sh
index db84c8343e1..50891a64e4b 100644
--- a/package/system/uci/files/lib/config/uci.sh
+++ b/package/system/uci/files/lib/config/uci.sh
@@ -2,7 +2,7 @@
 # Shell script compatibility wrappers for /sbin/uci
 #
 # Copyright (C) 2008-2010  OpenWrt.org
-# Copyright (C) 2008  Felix Fietkau <nbd@openwrt.org>
+# Copyright (C) 2008  Felix Fietkau <nbd@nbd.name>
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
diff --git a/package/system/usign/Makefile b/package/system/usign/Makefile
index ce701cdb22e..5b40ce9630f 100644
--- a/package/system/usign/Makefile
+++ b/package/system/usign/Makefile
@@ -16,7 +16,7 @@ PKG_USE_MIPS16:=0
 PKG_LICENSE:=ISC
 PKG_LICENSE_FILES:=
 
-PKG_MAINTAINER:=Felix Fietkau <nbd@openwrt.org>
+PKG_MAINTAINER:=Felix Fietkau <nbd@nbd.name>
 
 include $(INCLUDE_DIR)/package.mk
 include $(INCLUDE_DIR)/host-build.mk
diff --git a/package/utils/busybox/Makefile b/package/utils/busybox/Makefile
index 065bf7df6f1..50e2baa0318 100644
--- a/package/utils/busybox/Makefile
+++ b/package/utils/busybox/Makefile
@@ -39,7 +39,7 @@ endif
 define Package/busybox
   SECTION:=base
   CATEGORY:=Base system
-  MAINTAINER:=Felix Fietkau <nbd@openwrt.org>
+  MAINTAINER:=Felix Fietkau <nbd@nbd.name>
   TITLE:=Core utilities for embedded Linux
   URL:=http://busybox.net/
   DEPENDS:=+BUSYBOX_USE_LIBRPC:librpc +BUSYBOX_CONFIG_PAM:libpam +BUSYBOX_CONFIG_NTPD:jsonfilter
diff --git a/package/utils/busybox/patches/010-networking-fix-uninitialized-memory-when-displaying-.patch b/package/utils/busybox/patches/010-networking-fix-uninitialized-memory-when-displaying-.patch
index 554fc8f21f8..eabbf3f9080 100644
--- a/package/utils/busybox/patches/010-networking-fix-uninitialized-memory-when-displaying-.patch
+++ b/package/utils/busybox/patches/010-networking-fix-uninitialized-memory-when-displaying-.patch
@@ -1,4 +1,4 @@
-From: Felix Fietkau <nbd@openwrt.org>
+From: Felix Fietkau <nbd@nbd.name>
 Date: Mon, 18 Jan 2016 12:03:45 +0100
 Subject: [PATCH] networking: fix uninitialized memory when displaying IPv6
  addresses
@@ -8,7 +8,7 @@ After commit 8e74adab0107658e3dc04ed342206272a284f43e
 INET_sprint6 uses more than just sin6_addr, it also tries to display the
 scope id, which is uninitialized when called from ife_print6.
 
-Signed-off-by: Felix Fietkau <nbd@openwrt.org>
+Signed-off-by: Felix Fietkau <nbd@nbd.name>
 ---
 
 --- a/networking/interface.c
diff --git a/package/utils/busybox/patches/020-networking-libiproute-fix-displaying-route-table-for.patch b/package/utils/busybox/patches/020-networking-libiproute-fix-displaying-route-table-for.patch
index 1e153ea918c..60027c48ab8 100644
--- a/package/utils/busybox/patches/020-networking-libiproute-fix-displaying-route-table-for.patch
+++ b/package/utils/busybox/patches/020-networking-libiproute-fix-displaying-route-table-for.patch
@@ -1,11 +1,11 @@
-From: Felix Fietkau <nbd@openwrt.org>
+From: Felix Fietkau <nbd@nbd.name>
 Date: Sun, 7 Feb 2016 21:11:21 +0100
 Subject: [PATCH] networking/libiproute: fix displaying route table for rules
 
 r->rtm_table only supports a 8 bit table id, prefer RTA_TABLE if
 present.
 
-Signed-off-by: Felix Fietkau <nbd@openwrt.org>
+Signed-off-by: Felix Fietkau <nbd@nbd.name>
 ---
 
 --- a/networking/libiproute/iprule.c
diff --git a/package/utils/busybox/patches/210-add_netmsg_util.patch b/package/utils/busybox/patches/210-add_netmsg_util.patch
index 8162e3b6151..23f05755bd1 100644
--- a/package/utils/busybox/patches/210-add_netmsg_util.patch
+++ b/package/utils/busybox/patches/210-add_netmsg_util.patch
@@ -37,7 +37,7 @@
 +++ b/networking/netmsg.c
 @@ -0,0 +1,65 @@
 +/*
-+ * Copyright (C) 2006 Felix Fietkau <nbd@openwrt.org>
++ * Copyright (C) 2006 Felix Fietkau <nbd@nbd.name>
 + *
 + * This is free software, licensed under the GNU General Public License v2.
 + */
diff --git a/package/utils/busybox/patches/220-add_lock_util.patch b/package/utils/busybox/patches/220-add_lock_util.patch
index 9cac9e62195..047d32ef103 100644
--- a/package/utils/busybox/patches/220-add_lock_util.patch
+++ b/package/utils/busybox/patches/220-add_lock_util.patch
@@ -37,7 +37,7 @@
 +++ b/miscutils/lock.c
 @@ -0,0 +1,144 @@
 +/*
-+ * Copyright (C) 2006 Felix Fietkau <nbd@openwrt.org>
++ * Copyright (C) 2006 Felix Fietkau <nbd@nbd.name>
 + *
 + * This is free software, licensed under the GNU General Public License v2.
 + */
diff --git a/package/utils/mdadm/Makefile b/package/utils/mdadm/Makefile
index 0d5848c2181..5ac9a7f136a 100644
--- a/package/utils/mdadm/Makefile
+++ b/package/utils/mdadm/Makefile
@@ -15,7 +15,7 @@ PKG_SOURCE_URL:=@KERNEL/linux/utils/raid/mdadm
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
 PKG_MD5SUM:=2fd33dedcdb06f0d1461f50ddabb7e4a
 
-PKG_MAINTAINER:=Felix Fietkau <nbd@openwrt.org>
+PKG_MAINTAINER:=Felix Fietkau <nbd@nbd.name>
 
 PKG_BUILD_PARALLEL:=1
 
diff --git a/package/utils/px5g/px5g.c b/package/utils/px5g/px5g.c
index d662232021c..e9b82c27674 100644
--- a/package/utils/px5g/px5g.c
+++ b/package/utils/px5g/px5g.c
@@ -2,7 +2,7 @@
  * px5g - Embedded x509 key and certificate generator based on PolarSSL
  *
  *   Copyright (C) 2009 Steven Barth <steven@midlink.org>
- *   Copyright (C) 2014 Felix Fietkau <nbd@openwrt.org>
+ *   Copyright (C) 2014 Felix Fietkau <nbd@nbd.name>
  *
  *  This library is free software; you can redistribute it and/or
  *  modify it under the terms of the GNU Lesser General Public
diff --git a/package/utils/usbmode/Makefile b/package/utils/usbmode/Makefile
index 68d955aab28..b4e41a252ce 100644
--- a/package/utils/usbmode/Makefile
+++ b/package/utils/usbmode/Makefile
@@ -14,7 +14,7 @@ CMAKE_INSTALL:=1
 PKG_LICENSE:=GPL-2.0
 PKG_LICENSE_FILES:=
 
-PKG_MAINTAINER:=Felix Fietkau <nbd@openwrt.org>
+PKG_MAINTAINER:=Felix Fietkau <nbd@nbd.name>
 
 PKG_DATA_VERSION:=20150115
 PKG_DATA_URL:=http://www.draisberghof.de/usb_modeswitch
diff --git a/package/utils/usbutils/Makefile b/package/utils/usbutils/Makefile
index 14c97ba8e70..40d905fbbe8 100644
--- a/package/utils/usbutils/Makefile
+++ b/package/utils/usbutils/Makefile
@@ -24,7 +24,7 @@ USB_IDS_FILE:=usb.ids
 PKG_BUILD_PARALLEL:=1
 PKG_INSTALL:=1
 
-PKG_MAINTAINER := Felix Fietkau <nbd@openwrt.org>
+PKG_MAINTAINER := Felix Fietkau <nbd@nbd.name>
 
 include $(INCLUDE_DIR)/package.mk
 
diff --git a/scripts/kconfig.pl b/scripts/kconfig.pl
index 45c565e7a99..6a6bbd27472 100755
--- a/scripts/kconfig.pl
+++ b/scripts/kconfig.pl
@@ -1,6 +1,6 @@
 #!/usr/bin/env perl
 # 
-# Copyright (C) 2006 Felix Fietkau <nbd@openwrt.org>
+# Copyright (C) 2006 Felix Fietkau <nbd@nbd.name>
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
diff --git a/target/linux/adm8668/files-3.18/arch/mips/adm8668/prom.c b/target/linux/adm8668/files-3.18/arch/mips/adm8668/prom.c
index 24b77f8b9df..cb97bb30a0c 100644
--- a/target/linux/adm8668/files-3.18/arch/mips/adm8668/prom.c
+++ b/target/linux/adm8668/files-3.18/arch/mips/adm8668/prom.c
@@ -5,7 +5,7 @@
  *  Copyright (C) 2003, Peter Sadik <peter.sadik@idt.com>
  *  Copyright (C) 2005-2006, P.Christeas <p_christ@hol.gr>
  *  Copyright (C) 2007, Gabor Juhos <juhosg@openwrt.org>
- *			Felix Fietkau <nbd@openwrt.org>
+ *			Felix Fietkau <nbd@nbd.name>
  *			Florian Fainelli <florian@openwrt.org>
  *
  * This file is subject to the terms and conditions of the GNU General Public
diff --git a/target/linux/adm8668/files-3.18/drivers/mtd/maps/adm8668.c b/target/linux/adm8668/files-3.18/drivers/mtd/maps/adm8668.c
index 8737159ddf1..7e51d5828d1 100644
--- a/target/linux/adm8668/files-3.18/drivers/mtd/maps/adm8668.c
+++ b/target/linux/adm8668/files-3.18/drivers/mtd/maps/adm8668.c
@@ -1,6 +1,6 @@
 /*
  *  Copyright (C) 2010 Scott Nicholas <neutronscott@scottn.us>
- *  Copyright (C) 2006 Felix Fietkau <nbd@openwrt.org>
+ *  Copyright (C) 2006 Felix Fietkau <nbd@nbd.name>
  *  Copyright (C) 2005 Waldemar Brodkorb <wbx@openwrt.org>
  *  Copyright (C) 2004 Florian Schirmer (jolt@tuxbox.org)
  *
diff --git a/target/linux/ar71xx/files/arch/mips/ath79/mach-pb92.c b/target/linux/ar71xx/files/arch/mips/ath79/mach-pb92.c
index 76715a517eb..2440f0b6d3e 100644
--- a/target/linux/ar71xx/files/arch/mips/ath79/mach-pb92.c
+++ b/target/linux/ar71xx/files/arch/mips/ath79/mach-pb92.c
@@ -1,7 +1,7 @@
 /*
  *  Atheros PB92 board support
  *
- *  Copyright (C) 2010 Felix Fietkau <nbd@openwrt.org>
+ *  Copyright (C) 2010 Felix Fietkau <nbd@nbd.name>
  *  Copyright (C) 2008-2009 Gabor Juhos <juhosg@openwrt.org>
  *  Copyright (C) 2008 Imre Kaloz <kaloz@openwrt.org>
  *
diff --git a/target/linux/ar71xx/files/arch/mips/ath79/mach-wzr-hp-ag300h.c b/target/linux/ar71xx/files/arch/mips/ath79/mach-wzr-hp-ag300h.c
index edd48f2aab6..ec3f1ff8451 100644
--- a/target/linux/ar71xx/files/arch/mips/ath79/mach-wzr-hp-ag300h.c
+++ b/target/linux/ar71xx/files/arch/mips/ath79/mach-wzr-hp-ag300h.c
@@ -1,7 +1,7 @@
 /*
  *  Buffalo WZR-HP-AG300H board support
  *
- *  Copyright (C) 2011 Felix Fietkau <nbd@openwrt.org>
+ *  Copyright (C) 2011 Felix Fietkau <nbd@nbd.name>
  *
  *  This program is free software; you can redistribute it and/or modify it
  *  under the terms of the GNU General Public License version 2 as published
diff --git a/target/linux/ar71xx/files/arch/mips/ath79/mach-wzr-hp-g300nh2.c b/target/linux/ar71xx/files/arch/mips/ath79/mach-wzr-hp-g300nh2.c
index 733d996ea0e..296551348f4 100644
--- a/target/linux/ar71xx/files/arch/mips/ath79/mach-wzr-hp-g300nh2.c
+++ b/target/linux/ar71xx/files/arch/mips/ath79/mach-wzr-hp-g300nh2.c
@@ -1,7 +1,7 @@
 /*
  *  Buffalo WZR-HP-G300NH2 board support
  *
- *  Copyright (C) 2011 Felix Fietkau <nbd@openwrt.org>
+ *  Copyright (C) 2011 Felix Fietkau <nbd@nbd.name>
  *  Copyright (C) 2011 Mark Deneen <mdeneen@gmail.com>
  *
  *  This program is free software; you can redistribute it and/or modify it
diff --git a/target/linux/ar71xx/files/arch/mips/ath79/mach-wzr-hp-g450h.c b/target/linux/ar71xx/files/arch/mips/ath79/mach-wzr-hp-g450h.c
index a559d732d7e..53f37b09811 100644
--- a/target/linux/ar71xx/files/arch/mips/ath79/mach-wzr-hp-g450h.c
+++ b/target/linux/ar71xx/files/arch/mips/ath79/mach-wzr-hp-g450h.c
@@ -1,7 +1,7 @@
 /*
  *  Buffalo WZR-HP-G450G board support
  *
- *  Copyright (C) 2011 Felix Fietkau <nbd@openwrt.org>
+ *  Copyright (C) 2011 Felix Fietkau <nbd@nbd.name>
  *  Copyright (C) 2008-2012 Gabor Juhos <juhosg@openwrt.org>
  *  Copyright (C) 2008 Imre Kaloz <kaloz@openwrt.org>
  *
diff --git a/target/linux/ar71xx/files/drivers/mtd/cybertan_part.c b/target/linux/ar71xx/files/drivers/mtd/cybertan_part.c
index 7c6dad85498..391411f8de1 100644
--- a/target/linux/ar71xx/files/drivers/mtd/cybertan_part.c
+++ b/target/linux/ar71xx/files/drivers/mtd/cybertan_part.c
@@ -17,7 +17,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  *
  * TRX flash partition table.
- * Based on ar7 map by Felix Fietkau <nbd@openwrt.org>
+ * Based on ar7 map by Felix Fietkau <nbd@nbd.name>
  *
  */
 
diff --git a/target/linux/ar71xx/files/drivers/net/ethernet/atheros/ag71xx/ag71xx_ar7240.c b/target/linux/ar71xx/files/drivers/net/ethernet/atheros/ag71xx/ag71xx_ar7240.c
index 8dfff3b6eb8..c5aed0d2dbf 100644
--- a/target/linux/ar71xx/files/drivers/net/ethernet/atheros/ag71xx/ag71xx_ar7240.c
+++ b/target/linux/ar71xx/files/drivers/net/ethernet/atheros/ag71xx/ag71xx_ar7240.c
@@ -1,7 +1,7 @@
 /*
  *  Driver for the built-in ethernet switch of the Atheros AR7240 SoC
  *  Copyright (c) 2010 Gabor Juhos <juhosg@openwrt.org>
- *  Copyright (c) 2010 Felix Fietkau <nbd@openwrt.org>
+ *  Copyright (c) 2010 Felix Fietkau <nbd@nbd.name>
  *
  *  This program is free software; you can redistribute it and/or modify it
  *  under the terms of the GNU General Public License version 2 as published
diff --git a/target/linux/ath25/patches-4.4/107-ar5312_gpio.patch b/target/linux/ath25/patches-4.4/107-ar5312_gpio.patch
index 84f9fbdd2e9..13a4393aee3 100644
--- a/target/linux/ath25/patches-4.4/107-ar5312_gpio.patch
+++ b/target/linux/ath25/patches-4.4/107-ar5312_gpio.patch
@@ -87,7 +87,7 @@
 + * Copyright (C) 2003 Atheros Communications, Inc.,  All Rights Reserved.
 + * Copyright (C) 2006 FON Technology, SL.
 + * Copyright (C) 2006 Imre Kaloz <kaloz@openwrt.org>
-+ * Copyright (C) 2006-2009 Felix Fietkau <nbd@openwrt.org>
++ * Copyright (C) 2006-2009 Felix Fietkau <nbd@nbd.name>
 + * Copyright (C) 2012 Alexandros C. Couloumbis <alex@ozo.com>
 + */
 +
diff --git a/target/linux/ath25/patches-4.4/108-ar2315_gpio.patch b/target/linux/ath25/patches-4.4/108-ar2315_gpio.patch
index 33002925546..ba9c3f77dac 100644
--- a/target/linux/ath25/patches-4.4/108-ar2315_gpio.patch
+++ b/target/linux/ath25/patches-4.4/108-ar2315_gpio.patch
@@ -110,7 +110,7 @@
 + * Copyright (C) 2003 Atheros Communications, Inc.,  All Rights Reserved.
 + * Copyright (C) 2006 FON Technology, SL.
 + * Copyright (C) 2006 Imre Kaloz <kaloz@openwrt.org>
-+ * Copyright (C) 2006 Felix Fietkau <nbd@openwrt.org>
++ * Copyright (C) 2006 Felix Fietkau <nbd@nbd.name>
 + * Copyright (C) 2012 Alexandros C. Couloumbis <alex@ozo.com>
 + */
 +
diff --git a/target/linux/ath25/patches-4.4/110-ar2313_ethernet.patch b/target/linux/ath25/patches-4.4/110-ar2313_ethernet.patch
index 0efdb27af4e..9b1286c075f 100644
--- a/target/linux/ath25/patches-4.4/110-ar2313_ethernet.patch
+++ b/target/linux/ath25/patches-4.4/110-ar2313_ethernet.patch
@@ -39,7 +39,7 @@
 + *
 + * Copyright (C) 2004 by Sameer Dekate <sdekate@arubanetworks.com>
 + * Copyright (C) 2006 Imre Kaloz <kaloz@openwrt.org>
-+ * Copyright (C) 2006-2009 Felix Fietkau <nbd@openwrt.org>
++ * Copyright (C) 2006-2009 Felix Fietkau <nbd@nbd.name>
 + *
 + * Thanks to Atheros for providing hardware and documentation
 + * enabling me to write this driver.
@@ -152,7 +152,7 @@
 +
 +#ifdef MODULE
 +MODULE_LICENSE("GPL");
-+MODULE_AUTHOR("Sameer Dekate <sdekate@arubanetworks.com>, Imre Kaloz <kaloz@openwrt.org>, Felix Fietkau <nbd@openwrt.org>");
++MODULE_AUTHOR("Sameer Dekate <sdekate@arubanetworks.com>, Imre Kaloz <kaloz@openwrt.org>, Felix Fietkau <nbd@nbd.name>");
 +MODULE_DESCRIPTION("AR231x Ethernet driver");
 +#endif
 +
@@ -1248,7 +1248,7 @@
 + *
 + * Copyright (C) 2004 by Sameer Dekate <sdekate@arubanetworks.com>
 + * Copyright (C) 2006 Imre Kaloz <kaloz@openwrt.org>
-+ * Copyright (C) 2006-2009 Felix Fietkau <nbd@openwrt.org>
++ * Copyright (C) 2006-2009 Felix Fietkau <nbd@nbd.name>
 + *
 + * Thanks to Atheros for providing hardware and documentation
 + * enabling me to write this driver.
diff --git a/target/linux/ath25/patches-4.4/120-spiflash.patch b/target/linux/ath25/patches-4.4/120-spiflash.patch
index a47e3631895..91cb8bee743 100644
--- a/target/linux/ath25/patches-4.4/120-spiflash.patch
+++ b/target/linux/ath25/patches-4.4/120-spiflash.patch
@@ -31,7 +31,7 @@
 + * Copyright (c) 2005-2006 Atheros Communications Inc.
 + * Copyright (C) 2006-2007 FON Technology, SL.
 + * Copyright (C) 2006-2007 Imre Kaloz <kaloz@openwrt.org>
-+ * Copyright (C) 2006-2009 Felix Fietkau <nbd@openwrt.org>
++ * Copyright (C) 2006-2009 Felix Fietkau <nbd@nbd.name>
 + * Copyright (C) 2012 Alexandros C. Couloumbis <alex@ozo.com>
 + *
 + * This code is free software; you can redistribute it and/or modify
@@ -492,7 +492,7 @@
 + * Copyright (c) 2005, Atheros Communications Inc.
 + * Copyright (C) 2006 FON Technology, SL.
 + * Copyright (C) 2006 Imre Kaloz <kaloz@openwrt.org>
-+ * Copyright (C) 2006-2009 Felix Fietkau <nbd@openwrt.org>
++ * Copyright (C) 2006-2009 Felix Fietkau <nbd@nbd.name>
 + *
 + * This code is free software; you can redistribute it and/or modify
 + * it under the terms of the GNU General Public License version 2 as
diff --git a/target/linux/ath25/patches-4.4/210-reset_button.patch b/target/linux/ath25/patches-4.4/210-reset_button.patch
index 34ef46bc52b..89853c84bc1 100644
--- a/target/linux/ath25/patches-4.4/210-reset_button.patch
+++ b/target/linux/ath25/patches-4.4/210-reset_button.patch
@@ -1,7 +1,7 @@
 --- a/arch/mips/ath25/Makefile
 +++ b/arch/mips/ath25/Makefile
 @@ -8,7 +8,7 @@
- # Copyright (C) 2006-2009 Felix Fietkau <nbd@openwrt.org>
+ # Copyright (C) 2006-2009 Felix Fietkau <nbd@nbd.name>
  #
  
 -obj-y += board.o prom.o devices.o
diff --git a/target/linux/bcm53xx/files/drivers/firmware/broadcom/bcm47xx_sprom.c b/target/linux/bcm53xx/files/drivers/firmware/broadcom/bcm47xx_sprom.c
index b6eb875d4af..dfcccb0499f 100644
--- a/target/linux/bcm53xx/files/drivers/firmware/broadcom/bcm47xx_sprom.c
+++ b/target/linux/bcm53xx/files/drivers/firmware/broadcom/bcm47xx_sprom.c
@@ -1,6 +1,6 @@
 /*
  *  Copyright (C) 2004 Florian Schirmer <jolt@tuxbox.org>
- *  Copyright (C) 2006 Felix Fietkau <nbd@openwrt.org>
+ *  Copyright (C) 2006 Felix Fietkau <nbd@nbd.name>
  *  Copyright (C) 2006 Michael Buesch <m@bues.ch>
  *  Copyright (C) 2010 Waldemar Brodkorb <wbx@openadk.org>
  *  Copyright (C) 2010-2012 Hauke Mehrtens <hauke@hauke-m.de>
diff --git a/target/linux/bcm53xx/patches-4.4/332-ARM-BCM5301X-Add-power-button-for-Buffalo-WZR-1750DHP.patch b/target/linux/bcm53xx/patches-4.4/332-ARM-BCM5301X-Add-power-button-for-Buffalo-WZR-1750DHP.patch
index 849537e0328..e7262cb9097 100644
--- a/target/linux/bcm53xx/patches-4.4/332-ARM-BCM5301X-Add-power-button-for-Buffalo-WZR-1750DHP.patch
+++ b/target/linux/bcm53xx/patches-4.4/332-ARM-BCM5301X-Add-power-button-for-Buffalo-WZR-1750DHP.patch
@@ -1,7 +1,7 @@
-From: Felix Fietkau <nbd@openwrt.org>
+From: Felix Fietkau <nbd@nbd.name>
 Subject: [PATCH] ARM: BCM5301X: Add power button for Buffalo WZR-1750DHP
 
-Signed-off-by: Felix Fietkau <nbd@openwrt.org>
+Signed-off-by: Felix Fietkau <nbd@nbd.name>
 ---
 --- a/arch/arm/boot/dts/bcm4708-buffalo-wzr-1750dhp.dts
 +++ b/arch/arm/boot/dts/bcm4708-buffalo-wzr-1750dhp.dts
diff --git a/target/linux/brcm47xx/patches-4.1/820-wgt634u-nvram-fix.patch b/target/linux/brcm47xx/patches-4.1/820-wgt634u-nvram-fix.patch
index 4738c223c4e..06b1be0d288 100644
--- a/target/linux/brcm47xx/patches-4.1/820-wgt634u-nvram-fix.patch
+++ b/target/linux/brcm47xx/patches-4.1/820-wgt634u-nvram-fix.patch
@@ -17,7 +17,7 @@ out the configuration than the in kernel cfe config reader.
 + * CFE environment variable access
 + *
 + * Copyright 2001-2003, Broadcom Corporation
-+ * Copyright 2006, Felix Fietkau <nbd@openwrt.org>
++ * Copyright 2006, Felix Fietkau <nbd@nbd.name>
 + * 
 + * This program is free software; you can redistribute  it and/or modify it
 + * under  the terms of  the GNU General  Public License as published by the
diff --git a/target/linux/brcm47xx/patches-4.4/820-wgt634u-nvram-fix.patch b/target/linux/brcm47xx/patches-4.4/820-wgt634u-nvram-fix.patch
index 6e10311d0c3..da0f56fd5bd 100644
--- a/target/linux/brcm47xx/patches-4.4/820-wgt634u-nvram-fix.patch
+++ b/target/linux/brcm47xx/patches-4.4/820-wgt634u-nvram-fix.patch
@@ -15,7 +15,7 @@ out the configuration than the in kernel cfe config reader.
 + * CFE environment variable access
 + *
 + * Copyright 2001-2003, Broadcom Corporation
-+ * Copyright 2006, Felix Fietkau <nbd@openwrt.org>
++ * Copyright 2006, Felix Fietkau <nbd@nbd.name>
 + * 
 + * This program is free software; you can redistribute  it and/or modify it
 + * under  the terms of  the GNU General  Public License as published by the
diff --git a/target/linux/cns3xxx/Makefile b/target/linux/cns3xxx/Makefile
index 73d79c0c8f6..52425821ecc 100644
--- a/target/linux/cns3xxx/Makefile
+++ b/target/linux/cns3xxx/Makefile
@@ -12,7 +12,7 @@ BOARDNAME:=Cavium Networks Econa CNS3xxx
 FEATURES:=squashfs fpu gpio pcie usb usbgadget
 CPU_TYPE:=mpcore
 CPU_SUBTYPE:=vfp
-MAINTAINER:=Felix Fietkau <nbd@openwrt.org>
+MAINTAINER:=Felix Fietkau <nbd@nbd.name>
 
 KERNEL_PATCHVER:=4.4
 
diff --git a/target/linux/generic/files/drivers/mtd/mtdsplit/mtdsplit.c b/target/linux/generic/files/drivers/mtd/mtdsplit/mtdsplit.c
index 9a330df252d..b2e51dcfc66 100644
--- a/target/linux/generic/files/drivers/mtd/mtdsplit/mtdsplit.c
+++ b/target/linux/generic/files/drivers/mtd/mtdsplit/mtdsplit.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2009-2013 Felix Fietkau <nbd@openwrt.org>
+ * Copyright (C) 2009-2013 Felix Fietkau <nbd@nbd.name>
  * Copyright (C) 2009-2013 Gabor Juhos <juhosg@openwrt.org>
  * Copyright (C) 2012 Jonas Gorski <jogo@openwrt.org>
  * Copyright (C) 2013 Hauke Mehrtens <hauke@hauke-m.de>
diff --git a/target/linux/generic/files/drivers/mtd/mtdsplit/mtdsplit.h b/target/linux/generic/files/drivers/mtd/mtdsplit/mtdsplit.h
index 0b52f088c47..71d62a8956b 100644
--- a/target/linux/generic/files/drivers/mtd/mtdsplit/mtdsplit.h
+++ b/target/linux/generic/files/drivers/mtd/mtdsplit/mtdsplit.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2009-2013 Felix Fietkau <nbd@openwrt.org>
+ * Copyright (C) 2009-2013 Felix Fietkau <nbd@nbd.name>
  * Copyright (C) 2009-2013 Gabor Juhos <juhosg@openwrt.org>
  * Copyright (C) 2012 Jonas Gorski <jogo@openwrt.org>
  * Copyright (C) 2013 Hauke Mehrtens <hauke@hauke-m.de>
diff --git a/target/linux/generic/files/drivers/mtd/mtdsplit/mtdsplit_squashfs.c b/target/linux/generic/files/drivers/mtd/mtdsplit/mtdsplit_squashfs.c
index 5329037f095..43b44d5642b 100644
--- a/target/linux/generic/files/drivers/mtd/mtdsplit/mtdsplit_squashfs.c
+++ b/target/linux/generic/files/drivers/mtd/mtdsplit/mtdsplit_squashfs.c
@@ -1,5 +1,5 @@
 /*
- *  Copyright (C) 2013 Felix Fietkau <nbd@openwrt.org>
+ *  Copyright (C) 2013 Felix Fietkau <nbd@nbd.name>
  *  Copyright (C) 2013 Gabor Juhos <juhosg@openwrt.org>
  *
  *  This program is free software; you can redistribute it and/or modify it
diff --git a/target/linux/generic/files/drivers/mtd/mtdsplit/mtdsplit_tplink.c b/target/linux/generic/files/drivers/mtd/mtdsplit/mtdsplit_tplink.c
index c65e60a3e2a..d0cb381363d 100644
--- a/target/linux/generic/files/drivers/mtd/mtdsplit/mtdsplit_tplink.c
+++ b/target/linux/generic/files/drivers/mtd/mtdsplit/mtdsplit_tplink.c
@@ -1,6 +1,6 @@
 /*
  *  Copyright (C) 2013 Gabor Juhos <juhosg@openwrt.org>
- *  Copyright (C) 2014 Felix Fietkau <nbd@openwrt.org>
+ *  Copyright (C) 2014 Felix Fietkau <nbd@nbd.name>
  *
  *  This program is free software; you can redistribute it and/or modify it
  *  under the terms of the GNU General Public License version 2 as published
diff --git a/target/linux/generic/files/drivers/mtd/mtdsplit/mtdsplit_trx.c b/target/linux/generic/files/drivers/mtd/mtdsplit/mtdsplit_trx.c
index 6efffce1965..29f47b283e7 100644
--- a/target/linux/generic/files/drivers/mtd/mtdsplit/mtdsplit_trx.c
+++ b/target/linux/generic/files/drivers/mtd/mtdsplit/mtdsplit_trx.c
@@ -1,6 +1,6 @@
 /*
  *  Copyright (C) 2013 Gabor Juhos <juhosg@openwrt.org>
- *  Copyright (C) 2014 Felix Fietkau <nbd@openwrt.org>
+ *  Copyright (C) 2014 Felix Fietkau <nbd@nbd.name>
  *
  *  This program is free software; you can redistribute it and/or modify it
  *  under the terms of the GNU General Public License version 2 as published
diff --git a/target/linux/generic/files/drivers/net/phy/adm6996.c b/target/linux/generic/files/drivers/net/phy/adm6996.c
index cada4aa5db7..a2ff2b00a54 100644
--- a/target/linux/generic/files/drivers/net/phy/adm6996.c
+++ b/target/linux/generic/files/drivers/net/phy/adm6996.c
@@ -3,7 +3,7 @@
  *
  * swconfig interface based on ar8216.c
  *
- * Copyright (c) 2008 Felix Fietkau <nbd@openwrt.org>
+ * Copyright (c) 2008 Felix Fietkau <nbd@nbd.name>
  * VLAN support Copyright (c) 2010, 2011 Peter Lebbing <peter@digitalbrains.com>
  * Copyright (c) 2013 Hauke Mehrtens <hauke@hauke-m.de>
  * Copyright (c) 2014 Matti Laakso <malaakso@elisanet.fi>
diff --git a/target/linux/generic/files/drivers/net/phy/adm6996.h b/target/linux/generic/files/drivers/net/phy/adm6996.h
index 66c77a09688..6fd460a4659 100644
--- a/target/linux/generic/files/drivers/net/phy/adm6996.h
+++ b/target/linux/generic/files/drivers/net/phy/adm6996.h
@@ -1,7 +1,7 @@
 /*
  * ADM6996 switch driver
  *
- * Copyright (c) 2008 Felix Fietkau <nbd@openwrt.org>
+ * Copyright (c) 2008 Felix Fietkau <nbd@nbd.name>
  * Copyright (c) 2010,2011 Peter Lebbing <peter@digitalbrains.com>
  *
  * This program is free software; you can redistribute  it and/or modify it
diff --git a/target/linux/generic/files/drivers/net/phy/ar8216.c b/target/linux/generic/files/drivers/net/phy/ar8216.c
index fc5627258d3..70f47746a46 100644
--- a/target/linux/generic/files/drivers/net/phy/ar8216.c
+++ b/target/linux/generic/files/drivers/net/phy/ar8216.c
@@ -1,7 +1,7 @@
 /*
  * ar8216.c: AR8216 switch driver
  *
- * Copyright (C) 2009 Felix Fietkau <nbd@openwrt.org>
+ * Copyright (C) 2009 Felix Fietkau <nbd@nbd.name>
  * Copyright (C) 2011-2012 Gabor Juhos <juhosg@openwrt.org>
  *
  * This program is free software; you can redistribute it and/or
diff --git a/target/linux/generic/files/drivers/net/phy/ar8216.h b/target/linux/generic/files/drivers/net/phy/ar8216.h
index 0ccfef8abd7..6a3fd8db011 100644
--- a/target/linux/generic/files/drivers/net/phy/ar8216.h
+++ b/target/linux/generic/files/drivers/net/phy/ar8216.h
@@ -1,7 +1,7 @@
 /*
  * ar8216.h: AR8216 switch driver
  *
- * Copyright (C) 2009 Felix Fietkau <nbd@openwrt.org>
+ * Copyright (C) 2009 Felix Fietkau <nbd@nbd.name>
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
diff --git a/target/linux/generic/files/drivers/net/phy/ar8327.c b/target/linux/generic/files/drivers/net/phy/ar8327.c
index d8797820f20..e7e62e7e0d9 100644
--- a/target/linux/generic/files/drivers/net/phy/ar8327.c
+++ b/target/linux/generic/files/drivers/net/phy/ar8327.c
@@ -1,7 +1,7 @@
 /*
  * ar8327.c: AR8216 switch driver
  *
- * Copyright (C) 2009 Felix Fietkau <nbd@openwrt.org>
+ * Copyright (C) 2009 Felix Fietkau <nbd@nbd.name>
  * Copyright (C) 2011-2012 Gabor Juhos <juhosg@openwrt.org>
  *
  * This program is free software; you can redistribute it and/or
diff --git a/target/linux/generic/files/drivers/net/phy/ar8327.h b/target/linux/generic/files/drivers/net/phy/ar8327.h
index e8dad35d11d..7bce18bfb81 100644
--- a/target/linux/generic/files/drivers/net/phy/ar8327.h
+++ b/target/linux/generic/files/drivers/net/phy/ar8327.h
@@ -1,7 +1,7 @@
 /*
  * ar8327.h: AR8216 switch driver
  *
- * Copyright (C) 2009 Felix Fietkau <nbd@openwrt.org>
+ * Copyright (C) 2009 Felix Fietkau <nbd@nbd.name>
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
diff --git a/target/linux/generic/files/drivers/net/phy/ip17xx.c b/target/linux/generic/files/drivers/net/phy/ip17xx.c
index c82c39e052c..a4fe53dc5bd 100644
--- a/target/linux/generic/files/drivers/net/phy/ip17xx.c
+++ b/target/linux/generic/files/drivers/net/phy/ip17xx.c
@@ -3,7 +3,7 @@
  *
  * Copyright (C) 2008 Patrick Horn <patrick.horn@gmail.com>
  * Copyright (C) 2008, 2010 Martin Mares <mj@ucw.cz>
- * Copyright (C) 2009 Felix Fietkau <nbd@openwrt.org>
+ * Copyright (C) 2009 Felix Fietkau <nbd@nbd.name>
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
@@ -1402,7 +1402,7 @@ void __exit ip17xx_exit(void)
 }
 
 MODULE_AUTHOR("Patrick Horn <patrick.horn@gmail.com>");
-MODULE_AUTHOR("Felix Fietkau <nbd@openwrt.org>");
+MODULE_AUTHOR("Felix Fietkau <nbd@nbd.name>");
 MODULE_AUTHOR("Martin Mares <mj@ucw.cz>");
 MODULE_LICENSE("GPL");
 
diff --git a/target/linux/generic/files/drivers/net/phy/mvsw61xx.c b/target/linux/generic/files/drivers/net/phy/mvsw61xx.c
index f87905683fe..4d6dfc52cd2 100644
--- a/target/linux/generic/files/drivers/net/phy/mvsw61xx.c
+++ b/target/linux/generic/files/drivers/net/phy/mvsw61xx.c
@@ -4,7 +4,7 @@
  * Copyright (c) 2014 Claudio Leite <leitec@staticky.com>
  * Copyright (c) 2014 Nikita Nazarenko <nnazarenko@radiofid.com>
  *
- * Based on code (c) 2008 Felix Fietkau <nbd@openwrt.org>
+ * Based on code (c) 2008 Felix Fietkau <nbd@nbd.name>
  *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms of the GNU General Public License v2 as published by the
diff --git a/target/linux/generic/files/drivers/net/phy/mvsw61xx.h b/target/linux/generic/files/drivers/net/phy/mvsw61xx.h
index dbc6c92a444..ae78f5769d0 100644
--- a/target/linux/generic/files/drivers/net/phy/mvsw61xx.h
+++ b/target/linux/generic/files/drivers/net/phy/mvsw61xx.h
@@ -4,7 +4,7 @@
  * Copyright (c) 2014 Claudio Leite <leitec@staticky.com>
  * Copyright (c) 2014 Nikita Nazarenko <nnazarenko@radiofid.com>
  *
- * Based on code (c) 2008 Felix Fietkau <nbd@openwrt.org>
+ * Based on code (c) 2008 Felix Fietkau <nbd@nbd.name>
  *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms of the GNU General Public License v2 as published by the
diff --git a/target/linux/generic/files/drivers/net/phy/mvswitch.c b/target/linux/generic/files/drivers/net/phy/mvswitch.c
index 0ab447e8b28..af31d0b5ac0 100644
--- a/target/linux/generic/files/drivers/net/phy/mvswitch.c
+++ b/target/linux/generic/files/drivers/net/phy/mvswitch.c
@@ -1,6 +1,6 @@
 /*
  * Marvell 88E6060 switch driver
- * Copyright (c) 2008 Felix Fietkau <nbd@openwrt.org>
+ * Copyright (c) 2008 Felix Fietkau <nbd@nbd.name>
  *
  * This program is free software; you can redistribute  it and/or modify it
  * under  the terms of the GNU General Public License v2 as published by the
diff --git a/target/linux/generic/files/drivers/net/phy/mvswitch.h b/target/linux/generic/files/drivers/net/phy/mvswitch.h
index 1563eec4d58..ab2a1a126e0 100644
--- a/target/linux/generic/files/drivers/net/phy/mvswitch.h
+++ b/target/linux/generic/files/drivers/net/phy/mvswitch.h
@@ -1,6 +1,6 @@
 /*
  * Marvell 88E6060 switch driver
- * Copyright (c) 2008 Felix Fietkau <nbd@openwrt.org>
+ * Copyright (c) 2008 Felix Fietkau <nbd@nbd.name>
  *
  * This program is free software; you can redistribute  it and/or modify it
  * under  the terms of the GNU General Public License v2 as published by the
diff --git a/target/linux/generic/files/drivers/net/phy/rtl8306.c b/target/linux/generic/files/drivers/net/phy/rtl8306.c
index e280e9361a1..5206509c42a 100644
--- a/target/linux/generic/files/drivers/net/phy/rtl8306.c
+++ b/target/linux/generic/files/drivers/net/phy/rtl8306.c
@@ -1,7 +1,7 @@
 /*
  * rtl8306.c: RTL8306S switch driver
  *
- * Copyright (C) 2009 Felix Fietkau <nbd@openwrt.org>
+ * Copyright (C) 2009 Felix Fietkau <nbd@nbd.name>
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
diff --git a/target/linux/generic/files/drivers/net/phy/swconfig.c b/target/linux/generic/files/drivers/net/phy/swconfig.c
index 68ddd246add..b556510aef2 100644
--- a/target/linux/generic/files/drivers/net/phy/swconfig.c
+++ b/target/linux/generic/files/drivers/net/phy/swconfig.c
@@ -1,7 +1,7 @@
 /*
  * swconfig.c: Switch configuration API
  *
- * Copyright (C) 2008 Felix Fietkau <nbd@openwrt.org>
+ * Copyright (C) 2008 Felix Fietkau <nbd@nbd.name>
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
@@ -31,7 +31,7 @@
 
 #include "swconfig_leds.c"
 
-MODULE_AUTHOR("Felix Fietkau <nbd@openwrt.org>");
+MODULE_AUTHOR("Felix Fietkau <nbd@nbd.name>");
 MODULE_LICENSE("GPL");
 
 static int swdev_id;
diff --git a/target/linux/generic/files/include/linux/switch.h b/target/linux/generic/files/include/linux/switch.h
index 0c4cce7fa5b..dda4820a7a4 100644
--- a/target/linux/generic/files/include/linux/switch.h
+++ b/target/linux/generic/files/include/linux/switch.h
@@ -1,7 +1,7 @@
 /*
  * switch.h: Switch configuration API
  *
- * Copyright (C) 2008 Felix Fietkau <nbd@openwrt.org>
+ * Copyright (C) 2008 Felix Fietkau <nbd@nbd.name>
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
diff --git a/target/linux/generic/files/include/uapi/linux/switch.h b/target/linux/generic/files/include/uapi/linux/switch.h
index c0071a415af..ea449653faf 100644
--- a/target/linux/generic/files/include/uapi/linux/switch.h
+++ b/target/linux/generic/files/include/uapi/linux/switch.h
@@ -1,7 +1,7 @@
 /*
  * switch.h: Switch configuration API
  *
- * Copyright (C) 2008 Felix Fietkau <nbd@openwrt.org>
+ * Copyright (C) 2008 Felix Fietkau <nbd@nbd.name>
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
diff --git a/target/linux/generic/image/relocate/Makefile b/target/linux/generic/image/relocate/Makefile
index 19e701968f4..62e3b32ee2e 100644
--- a/target/linux/generic/image/relocate/Makefile
+++ b/target/linux/generic/image/relocate/Makefile
@@ -2,7 +2,7 @@
 # Makefile for the kernel relocation stub for MIPS devices
 #
 # Copyright (C) 2011 Gabor Juhos <juhosg@openwrt.org>
-# Copyright (C) 2015 Felix Fietkau <nbd@openwrt.org>
+# Copyright (C) 2015 Felix Fietkau <nbd@nbd.name>
 #
 # Some parts of this file was based on the OpenWrt specific lzma-loader
 # for the BCM47xx and ADM5120 based boards:
diff --git a/target/linux/generic/image/relocate/head.S b/target/linux/generic/image/relocate/head.S
index 3e5b374ba06..58c336d41ce 100644
--- a/target/linux/generic/image/relocate/head.S
+++ b/target/linux/generic/image/relocate/head.S
@@ -1,7 +1,7 @@
 /*
  * Kernel relocation stub for MIPS devices
  *
- * Copyright (C) 2015 Felix Fietkau <nbd@openwrt.org>
+ * Copyright (C) 2015 Felix Fietkau <nbd@nbd.name>
  *
  * Based on:
  *
diff --git a/target/linux/generic/patches-3.18/077-01-bgmac-fix-descriptor-frame-start-end-definitions.patch b/target/linux/generic/patches-3.18/077-01-bgmac-fix-descriptor-frame-start-end-definitions.patch
index fdfae3aeff9..fe8a6021605 100644
--- a/target/linux/generic/patches-3.18/077-01-bgmac-fix-descriptor-frame-start-end-definitions.patch
+++ b/target/linux/generic/patches-3.18/077-01-bgmac-fix-descriptor-frame-start-end-definitions.patch
@@ -1,4 +1,4 @@
-From: Felix Fietkau <nbd@openwrt.org>
+From: Felix Fietkau <nbd@nbd.name>
 Date: Mon, 23 Mar 2015 02:40:06 +0100
 Subject: [PATCH] bgmac: fix descriptor frame start/end definitions
 
@@ -6,7 +6,7 @@ The start-of-frame and end-of-frame bits were accidentally swapped.
 In the current code it does not make any difference, since they are
 always used together.
 
-Signed-off-by: Felix Fietkau <nbd@openwrt.org>
+Signed-off-by: Felix Fietkau <nbd@nbd.name>
 ---
 
 --- a/drivers/net/ethernet/broadcom/bgmac.h
diff --git a/target/linux/generic/patches-3.18/077-02-bgmac-implement-GRO-and-use-build_skb.patch b/target/linux/generic/patches-3.18/077-02-bgmac-implement-GRO-and-use-build_skb.patch
index 2a2df608b9a..8dc5242b5ae 100644
--- a/target/linux/generic/patches-3.18/077-02-bgmac-implement-GRO-and-use-build_skb.patch
+++ b/target/linux/generic/patches-3.18/077-02-bgmac-implement-GRO-and-use-build_skb.patch
@@ -1,10 +1,10 @@
-From: Felix Fietkau <nbd@openwrt.org>
+From: Felix Fietkau <nbd@nbd.name>
 Date: Mon, 23 Mar 2015 02:41:25 +0100
 Subject: [PATCH] bgmac: implement GRO and use build_skb
 
 This improves performance for routing and local rx
 
-Signed-off-by: Felix Fietkau <nbd@openwrt.org>
+Signed-off-by: Felix Fietkau <nbd@nbd.name>
 ---
 
 --- a/drivers/net/ethernet/broadcom/bgmac.c
diff --git a/target/linux/generic/patches-3.18/077-03-bgmac-implement-scatter-gather-support.patch b/target/linux/generic/patches-3.18/077-03-bgmac-implement-scatter-gather-support.patch
index 5cb21a565aa..ceb25e85ad8 100644
--- a/target/linux/generic/patches-3.18/077-03-bgmac-implement-scatter-gather-support.patch
+++ b/target/linux/generic/patches-3.18/077-03-bgmac-implement-scatter-gather-support.patch
@@ -1,4 +1,4 @@
-From: Felix Fietkau <nbd@openwrt.org>
+From: Felix Fietkau <nbd@nbd.name>
 Date: Mon, 23 Mar 2015 02:42:26 +0100
 Subject: [PATCH] bgmac: implement scatter/gather support
 
@@ -6,7 +6,7 @@ Always use software checksumming, since the hardware does not have any
 checksum offload support.
 This significantly improves local TCP tx performance.
 
-Signed-off-by: Felix Fietkau <nbd@openwrt.org>
+Signed-off-by: Felix Fietkau <nbd@nbd.name>
 ---
 
 --- a/drivers/net/ethernet/broadcom/bgmac.c
diff --git a/target/linux/generic/patches-3.18/077-04-bgmac-simplify-tx-ring-index-handling.patch b/target/linux/generic/patches-3.18/077-04-bgmac-simplify-tx-ring-index-handling.patch
index 241a3083a95..bf4a22dbea1 100644
--- a/target/linux/generic/patches-3.18/077-04-bgmac-simplify-tx-ring-index-handling.patch
+++ b/target/linux/generic/patches-3.18/077-04-bgmac-simplify-tx-ring-index-handling.patch
@@ -1,4 +1,4 @@
-From: Felix Fietkau <nbd@openwrt.org>
+From: Felix Fietkau <nbd@nbd.name>
 Date: Sun, 12 Apr 2015 09:58:56 +0200
 Subject: [PATCH] bgmac: simplify tx ring index handling
 
@@ -6,7 +6,7 @@ Keep incrementing ring->start and ring->end instead of pointing it to
 the actual ring slot entry. This simplifies the calculation of the
 number of free slots.
 
-Signed-off-by: Felix Fietkau <nbd@openwrt.org>
+Signed-off-by: Felix Fietkau <nbd@nbd.name>
 ---
 
 --- a/drivers/net/ethernet/broadcom/bgmac.c
diff --git a/target/linux/generic/patches-3.18/077-05-bgmac-leave-interrupts-disabled-as-long-as-there-is-.patch b/target/linux/generic/patches-3.18/077-05-bgmac-leave-interrupts-disabled-as-long-as-there-is-.patch
index 3bbe9ea9cb5..4e5e2e720a0 100644
--- a/target/linux/generic/patches-3.18/077-05-bgmac-leave-interrupts-disabled-as-long-as-there-is-.patch
+++ b/target/linux/generic/patches-3.18/077-05-bgmac-leave-interrupts-disabled-as-long-as-there-is-.patch
@@ -1,4 +1,4 @@
-From: Felix Fietkau <nbd@openwrt.org>
+From: Felix Fietkau <nbd@nbd.name>
 Date: Sun, 12 Apr 2015 10:08:04 +0200
 Subject: [PATCH] bgmac: leave interrupts disabled as long as there is work
  to do
@@ -10,7 +10,7 @@ In my tests this makes bridging/routing throughput under heavy load more
 stable and ensures that no new IRQs arrive as long as bgmac_poll uses up
 the entire budget.
 
-Signed-off-by: Felix Fietkau <nbd@openwrt.org>
+Signed-off-by: Felix Fietkau <nbd@nbd.name>
 ---
 
 --- a/drivers/net/ethernet/broadcom/bgmac.c
diff --git a/target/linux/generic/patches-3.18/077-06-bgmac-set-received-skb-headroom-to-NET_SKB_PAD.patch b/target/linux/generic/patches-3.18/077-06-bgmac-set-received-skb-headroom-to-NET_SKB_PAD.patch
index 2c490efbbb3..1b0742cd3a8 100644
--- a/target/linux/generic/patches-3.18/077-06-bgmac-set-received-skb-headroom-to-NET_SKB_PAD.patch
+++ b/target/linux/generic/patches-3.18/077-06-bgmac-set-received-skb-headroom-to-NET_SKB_PAD.patch
@@ -1,11 +1,11 @@
-From: Felix Fietkau <nbd@openwrt.org>
+From: Felix Fietkau <nbd@nbd.name>
 Date: Sun, 12 Apr 2015 10:13:28 +0200
 Subject: [PATCH] bgmac: set received skb headroom to NET_SKB_PAD
 
 A packet buffer offset of 30 bytes is inefficient, because the first 2
 bytes end up in a different cacheline.
 
-Signed-off-by: Felix Fietkau <nbd@openwrt.org>
+Signed-off-by: Felix Fietkau <nbd@nbd.name>
 ---
 
 --- a/drivers/net/ethernet/broadcom/bgmac.c
diff --git a/target/linux/generic/patches-3.18/077-07-bgmac-simplify-rx-DMA-error-handling.patch b/target/linux/generic/patches-3.18/077-07-bgmac-simplify-rx-DMA-error-handling.patch
index 2ca9d10f635..2be65b45441 100644
--- a/target/linux/generic/patches-3.18/077-07-bgmac-simplify-rx-DMA-error-handling.patch
+++ b/target/linux/generic/patches-3.18/077-07-bgmac-simplify-rx-DMA-error-handling.patch
@@ -1,11 +1,11 @@
-From: Felix Fietkau <nbd@openwrt.org>
+From: Felix Fietkau <nbd@nbd.name>
 Date: Sun, 12 Apr 2015 22:23:07 +0200
 Subject: [PATCH] bgmac: simplify/optimize rx DMA error handling
 
 Allocate a new buffer before processing the completed one. If allocation
 fails, reuse the old buffer.
 
-Signed-off-by: Felix Fietkau <nbd@openwrt.org>
+Signed-off-by: Felix Fietkau <nbd@nbd.name>
 ---
 
 --- a/drivers/net/ethernet/broadcom/bgmac.c
diff --git a/target/linux/generic/patches-3.18/077-08-bgmac-add-check-for-oversized-packets.patch b/target/linux/generic/patches-3.18/077-08-bgmac-add-check-for-oversized-packets.patch
index 705aa2d2a4d..6bb47476860 100644
--- a/target/linux/generic/patches-3.18/077-08-bgmac-add-check-for-oversized-packets.patch
+++ b/target/linux/generic/patches-3.18/077-08-bgmac-add-check-for-oversized-packets.patch
@@ -1,4 +1,4 @@
-From: Felix Fietkau <nbd@openwrt.org>
+From: Felix Fietkau <nbd@nbd.name>
 Date: Sun, 12 Apr 2015 22:28:20 +0200
 Subject: [PATCH] bgmac: add check for oversized packets
 
@@ -6,7 +6,7 @@ In very rare cases, the MAC can catch an internal buffer that is bigger
 than it's supposed to be. Instead of crashing the kernel, simply pass
 the buffer back to the hardware
 
-Signed-off-by: Felix Fietkau <nbd@openwrt.org>
+Signed-off-by: Felix Fietkau <nbd@nbd.name>
 ---
 
 --- a/drivers/net/ethernet/broadcom/bgmac.c
diff --git a/target/linux/generic/patches-3.18/077-09-bgmac-increase-rx-ring-size-from-511-to-512.patch b/target/linux/generic/patches-3.18/077-09-bgmac-increase-rx-ring-size-from-511-to-512.patch
index 4888cc32af4..1fc4ed03f1f 100644
--- a/target/linux/generic/patches-3.18/077-09-bgmac-increase-rx-ring-size-from-511-to-512.patch
+++ b/target/linux/generic/patches-3.18/077-09-bgmac-increase-rx-ring-size-from-511-to-512.patch
@@ -1,4 +1,4 @@
-From: Felix Fietkau <nbd@openwrt.org>
+From: Felix Fietkau <nbd@nbd.name>
 Date: Sun, 12 Apr 2015 22:36:16 +0200
 Subject: [PATCH] bgmac: increase rx ring size from 511 to 512
 
@@ -7,7 +7,7 @@ empty to allow the hardware to stop processing a buffer that has not
 been prepared yet. However, this doesn't work because this affects the
 total ring size as well
 
-Signed-off-by: Felix Fietkau <nbd@openwrt.org>
+Signed-off-by: Felix Fietkau <nbd@nbd.name>
 ---
 
 --- a/drivers/net/ethernet/broadcom/bgmac.h
diff --git a/target/linux/generic/patches-3.18/077-10-bgmac-simplify-dma-init-cleanup.patch b/target/linux/generic/patches-3.18/077-10-bgmac-simplify-dma-init-cleanup.patch
index f8d79211594..a49bd5f5e70 100644
--- a/target/linux/generic/patches-3.18/077-10-bgmac-simplify-dma-init-cleanup.patch
+++ b/target/linux/generic/patches-3.18/077-10-bgmac-simplify-dma-init-cleanup.patch
@@ -1,4 +1,4 @@
-From: Felix Fietkau <nbd@openwrt.org>
+From: Felix Fietkau <nbd@nbd.name>
 Date: Sun, 12 Apr 2015 23:19:32 +0200
 Subject: [PATCH] bgmac: simplify dma init/cleanup
 
@@ -6,7 +6,7 @@ Instead of allocating buffers at device init time and initializing
 descriptors at device open, do both at the same time (during open).
 Free all buffers when closing the device.
 
-Signed-off-by: Felix Fietkau <nbd@openwrt.org>
+Signed-off-by: Felix Fietkau <nbd@nbd.name>
 ---
 
 --- a/drivers/net/ethernet/broadcom/bgmac.c
diff --git a/target/linux/generic/patches-3.18/077-11-bgmac-fix-DMA-rx-corruption.patch b/target/linux/generic/patches-3.18/077-11-bgmac-fix-DMA-rx-corruption.patch
index 2e670d89b07..e7a7987f43b 100644
--- a/target/linux/generic/patches-3.18/077-11-bgmac-fix-DMA-rx-corruption.patch
+++ b/target/linux/generic/patches-3.18/077-11-bgmac-fix-DMA-rx-corruption.patch
@@ -1,4 +1,4 @@
-From: Felix Fietkau <nbd@openwrt.org>
+From: Felix Fietkau <nbd@nbd.name>
 Date: Sun, 12 Apr 2015 11:59:47 +0200
 Subject: [PATCH] bgmac: fix DMA rx corruption
 
@@ -12,7 +12,7 @@ which slots are initialized.
 
 To fix this issue, always mark the last filled rx slot as invalid.
 
-Signed-off-by: Felix Fietkau <nbd@openwrt.org>
+Signed-off-by: Felix Fietkau <nbd@nbd.name>
 ---
 
 --- a/drivers/net/ethernet/broadcom/bgmac.c
diff --git a/target/linux/generic/patches-3.18/077-12-bgmac-drop-ring-num_slots.patch b/target/linux/generic/patches-3.18/077-12-bgmac-drop-ring-num_slots.patch
index 4cd2e3f80cf..4dbb6f48de1 100644
--- a/target/linux/generic/patches-3.18/077-12-bgmac-drop-ring-num_slots.patch
+++ b/target/linux/generic/patches-3.18/077-12-bgmac-drop-ring-num_slots.patch
@@ -1,11 +1,11 @@
-From: Felix Fietkau <nbd@openwrt.org>
+From: Felix Fietkau <nbd@nbd.name>
 Date: Sun, 12 Apr 2015 23:28:38 +0200
 Subject: [PATCH] bgmac: drop ring->num_slots
 
 The ring size is always known at compile time, so make the code a bit
 more efficient
 
-Signed-off-by: Felix Fietkau <nbd@openwrt.org>
+Signed-off-by: Felix Fietkau <nbd@nbd.name>
 ---
 
 --- a/drivers/net/ethernet/broadcom/bgmac.c
diff --git a/target/linux/generic/patches-3.18/078-bgmac-reset-enable-Ethernet-core-before-using-it.patch b/target/linux/generic/patches-3.18/078-bgmac-reset-enable-Ethernet-core-before-using-it.patch
index 4626502f411..ca061a50d16 100644
--- a/target/linux/generic/patches-3.18/078-bgmac-reset-enable-Ethernet-core-before-using-it.patch
+++ b/target/linux/generic/patches-3.18/078-bgmac-reset-enable-Ethernet-core-before-using-it.patch
@@ -10,7 +10,7 @@ This fixes Ethernet on D-Link DIR-885L with BCM47094 SoC. Felix reported
 similar fix was needed for his BCM4709 device (Buffalo WXR-1900DHP?).
 I tested this for regressions on BCM4706, BCM4708A0 and BCM47081A0.
 
-Cc: Felix Fietkau <nbd@openwrt.org>
+Cc: Felix Fietkau <nbd@nbd.name>
 Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
 Signed-off-by: David S. Miller <davem@davemloft.net>
 ---
diff --git a/target/linux/generic/patches-3.18/079-bgmac-fix-MAC-soft-reset-bit-for-corerev-4.patch b/target/linux/generic/patches-3.18/079-bgmac-fix-MAC-soft-reset-bit-for-corerev-4.patch
index 6fa4eb0a463..f8d0a587696 100644
--- a/target/linux/generic/patches-3.18/079-bgmac-fix-MAC-soft-reset-bit-for-corerev-4.patch
+++ b/target/linux/generic/patches-3.18/079-bgmac-fix-MAC-soft-reset-bit-for-corerev-4.patch
@@ -1,5 +1,5 @@
 From c02bc350f9dbce7d637c394a6e1c4d29dc5b28b2 Mon Sep 17 00:00:00 2001
-From: Felix Fietkau <nbd@openwrt.org>
+From: Felix Fietkau <nbd@nbd.name>
 Date: Tue, 12 Apr 2016 18:27:29 +0200
 Subject: [PATCH] bgmac: fix MAC soft-reset bit for corerev > 4
 MIME-Version: 1.0
@@ -12,7 +12,7 @@ only some devices as most of BCM4708A0KF-s got core rev 4).
 This was tested for regressions on BCM47094 which doesn't seem to care
 which bit gets used.
 
-Signed-off-by: Felix Fietkau <nbd@openwrt.org>
+Signed-off-by: Felix Fietkau <nbd@nbd.name>
 Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
 Signed-off-by: David S. Miller <davem@davemloft.net>
 ---
diff --git a/target/linux/generic/patches-3.18/081-03-pppoe-drop-pppoe-device-in-pppoe_unbind_sock_work.patch b/target/linux/generic/patches-3.18/081-03-pppoe-drop-pppoe-device-in-pppoe_unbind_sock_work.patch
index fc26b8ffafc..07d64359ce3 100644
--- a/target/linux/generic/patches-3.18/081-03-pppoe-drop-pppoe-device-in-pppoe_unbind_sock_work.patch
+++ b/target/linux/generic/patches-3.18/081-03-pppoe-drop-pppoe-device-in-pppoe_unbind_sock_work.patch
@@ -1,4 +1,4 @@
-From: Felix Fietkau <nbd@openwrt.org>
+From: Felix Fietkau <nbd@nbd.name>
 Date: Sat, 9 May 2015 23:08:38 +0200
 Subject: [PATCH] pppoe: drop pppoe device in pppoe_unbind_sock_work
 
@@ -9,7 +9,7 @@ This leads to errors like this:
 [  488.570000] unregister_netdevice: waiting for eth0.2 to become free. Usage count = 2
 
 Fixes: 287f3a943fe ("pppoe: Use workqueue to die properly when a PADT is received")
-Signed-off-by: Felix Fietkau <nbd@openwrt.org>
+Signed-off-by: Felix Fietkau <nbd@nbd.name>
 Signed-off-by: David S. Miller <davem@davemloft.net>
 ---
 
diff --git a/target/linux/generic/patches-3.18/110-jffs2-use-.rename2-and-add-RENAME_WHITEOUT-support.patch b/target/linux/generic/patches-3.18/110-jffs2-use-.rename2-and-add-RENAME_WHITEOUT-support.patch
index 4ffa3c26fec..f671db6e947 100644
--- a/target/linux/generic/patches-3.18/110-jffs2-use-.rename2-and-add-RENAME_WHITEOUT-support.patch
+++ b/target/linux/generic/patches-3.18/110-jffs2-use-.rename2-and-add-RENAME_WHITEOUT-support.patch
@@ -1,10 +1,10 @@
-From: Felix Fietkau <nbd@openwrt.org>
+From: Felix Fietkau <nbd@nbd.name>
 Date: Fri, 10 Apr 2015 13:35:29 +0200
 Subject: [PATCH] jffs2: use .rename2 and add RENAME_WHITEOUT support
 
 It is required for renames on overlayfs
 
-Signed-off-by: Felix Fietkau <nbd@openwrt.org>
+Signed-off-by: Felix Fietkau <nbd@nbd.name>
 ---
 
 --- a/fs/jffs2/dir.c
diff --git a/target/linux/generic/patches-3.18/111-jffs2-add-RENAME_EXCHANGE-support.patch b/target/linux/generic/patches-3.18/111-jffs2-add-RENAME_EXCHANGE-support.patch
index df208da099a..be87c3507e9 100644
--- a/target/linux/generic/patches-3.18/111-jffs2-add-RENAME_EXCHANGE-support.patch
+++ b/target/linux/generic/patches-3.18/111-jffs2-add-RENAME_EXCHANGE-support.patch
@@ -1,8 +1,8 @@
-From: Felix Fietkau <nbd@openwrt.org>
+From: Felix Fietkau <nbd@nbd.name>
 Date: Sat, 25 Apr 2015 12:41:32 +0200
 Subject: [PATCH] jffs2: add RENAME_EXCHANGE support
 
-Signed-off-by: Felix Fietkau <nbd@openwrt.org>
+Signed-off-by: Felix Fietkau <nbd@nbd.name>
 ---
 
 --- a/fs/jffs2/dir.c
diff --git a/target/linux/generic/patches-3.18/120-bridge_allow_receiption_on_disabled_port.patch b/target/linux/generic/patches-3.18/120-bridge_allow_receiption_on_disabled_port.patch
index d80ef18dd38..909611403cb 100644
--- a/target/linux/generic/patches-3.18/120-bridge_allow_receiption_on_disabled_port.patch
+++ b/target/linux/generic/patches-3.18/120-bridge_allow_receiption_on_disabled_port.patch
@@ -11,7 +11,7 @@ block forwarding packets from these disabled ports, but there is no
 hard requirement to not allow local packet delivery.
 
 Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>
-Signed-off-by: Felix Fietkau <nbd@openwrt.org>
+Signed-off-by: Felix Fietkau <nbd@nbd.name>
 
 --- a/net/bridge/br_input.c
 +++ b/net/bridge/br_input.c
diff --git a/target/linux/generic/patches-3.18/132-mips_inline_dma_ops.patch b/target/linux/generic/patches-3.18/132-mips_inline_dma_ops.patch
index 8795bde0bd3..c008aea41de 100644
--- a/target/linux/generic/patches-3.18/132-mips_inline_dma_ops.patch
+++ b/target/linux/generic/patches-3.18/132-mips_inline_dma_ops.patch
@@ -1,5 +1,5 @@
 From 2c58080407554e1bac8fd50d23cb02420524caed Mon Sep 17 00:00:00 2001
-From: Felix Fietkau <nbd@openwrt.org>
+From: Felix Fietkau <nbd@nbd.name>
 Date: Mon, 12 Aug 2013 12:50:22 +0200
 Subject: [PATCH] MIPS: partially inline dma ops
 
@@ -10,7 +10,7 @@ unnecessary code.
 Inlining visibly improves network performance in my tests (on a 24Kc
 based system), and also slightly reduces code size of a few drivers.
 
-Signed-off-by: Felix Fietkau <nbd@openwrt.org>
+Signed-off-by: Felix Fietkau <nbd@nbd.name>
 ---
  arch/mips/Kconfig                   |   4 +
  arch/mips/include/asm/dma-mapping.h | 360 +++++++++++++++++++++++++++++++++++-
diff --git a/target/linux/generic/patches-3.18/204-module_strip.patch b/target/linux/generic/patches-3.18/204-module_strip.patch
index deef6b0c9a6..5b640bfe3eb 100644
--- a/target/linux/generic/patches-3.18/204-module_strip.patch
+++ b/target/linux/generic/patches-3.18/204-module_strip.patch
@@ -1,7 +1,7 @@
-From: Felix Fietkau <nbd@openwrt.org>
+From: Felix Fietkau <nbd@nbd.name>
 Subject: [PATCH] build: add a hack for removing non-essential module info
 
-Signed-off-by: Felix Fietkau <nbd@openwrt.org>
+Signed-off-by: Felix Fietkau <nbd@nbd.name>
 ---
 --- a/include/linux/module.h
 +++ b/include/linux/module.h
diff --git a/target/linux/generic/patches-3.18/220-gc_sections.patch b/target/linux/generic/patches-3.18/220-gc_sections.patch
index 775e11c1695..d872949f8d0 100644
--- a/target/linux/generic/patches-3.18/220-gc_sections.patch
+++ b/target/linux/generic/patches-3.18/220-gc_sections.patch
@@ -1,11 +1,11 @@
-From: Felix Fietkau <nbd@openwrt.org>
+From: Felix Fietkau <nbd@nbd.name>
 
 use -ffunction-sections, -fdata-sections and --gc-sections
 
 In combination with kernel symbol export stripping this significantly reduces
 the kernel image size. Used on both ARM and MIPS architectures.
 
-Signed-off-by: Felix Fietkau <nbd@openwrt.org>
+Signed-off-by: Felix Fietkau <nbd@nbd.name>
 Signed-off-by: Jonas Gorski <jogo@openwrt.org>
 Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
 ---
diff --git a/target/linux/generic/patches-3.18/307-mips_highmem_offset.patch b/target/linux/generic/patches-3.18/307-mips_highmem_offset.patch
index c9f0c84e301..5a7dc9cee9f 100644
--- a/target/linux/generic/patches-3.18/307-mips_highmem_offset.patch
+++ b/target/linux/generic/patches-3.18/307-mips_highmem_offset.patch
@@ -2,7 +2,7 @@ Adjust highmem offset to 0x10000000 to ensure that all kmalloc allocations
 stay within the same 256M boundary. This ensures that -mlong-calls is not
 needed on systems with more than 256M RAM.
 
-Signed-off-by: Felix Fietkau <nbd@openwrt.org>
+Signed-off-by: Felix Fietkau <nbd@nbd.name>
 ---
 --- a/arch/mips/include/asm/mach-generic/spaces.h
 +++ b/arch/mips/include/asm/mach-generic/spaces.h
diff --git a/target/linux/generic/patches-3.18/621-sched_act_connmark.patch b/target/linux/generic/patches-3.18/621-sched_act_connmark.patch
index 945974981a9..958aee42cf5 100644
--- a/target/linux/generic/patches-3.18/621-sched_act_connmark.patch
+++ b/target/linux/generic/patches-3.18/621-sched_act_connmark.patch
@@ -2,7 +2,7 @@
 +++ b/net/sched/act_connmark.c
 @@ -0,0 +1,126 @@
 +/*
-+ * Copyright (c) 2011 Felix Fietkau <nbd@openwrt.org>
++ * Copyright (c) 2011 Felix Fietkau <nbd@nbd.name>
 + *
 + * This program is free software; you can redistribute it and/or modify it
 + * under the terms and conditions of the GNU General Public License,
@@ -110,7 +110,7 @@
 +	.init		=	tcf_connmark_init,
 +};
 +
-+MODULE_AUTHOR("Felix Fietkau <nbd@openwrt.org>");
++MODULE_AUTHOR("Felix Fietkau <nbd@nbd.name>");
 +MODULE_DESCRIPTION("Connection tracking mark restoring");
 +MODULE_LICENSE("GPL");
 +
diff --git a/target/linux/generic/patches-3.18/630-packet_socket_type.patch b/target/linux/generic/patches-3.18/630-packet_socket_type.patch
index c3c0fe46644..7502a1c3b4a 100644
--- a/target/linux/generic/patches-3.18/630-packet_socket_type.patch
+++ b/target/linux/generic/patches-3.18/630-packet_socket_type.patch
@@ -3,7 +3,7 @@ broadcast, unicast, etc.) on packet sockets via setsockopt.
 This can reduce the load in situations where only a limited number
 of packet types are necessary
 
-Signed-off-by: Felix Fietkau <nbd@openwrt.org>
+Signed-off-by: Felix Fietkau <nbd@nbd.name>
 
 --- a/include/uapi/linux/if_packet.h
 +++ b/include/uapi/linux/if_packet.h
diff --git a/target/linux/generic/patches-3.18/640-bridge_no_eap_forward.patch b/target/linux/generic/patches-3.18/640-bridge_no_eap_forward.patch
index 7f38c4a5619..35802d63dc7 100644
--- a/target/linux/generic/patches-3.18/640-bridge_no_eap_forward.patch
+++ b/target/linux/generic/patches-3.18/640-bridge_no_eap_forward.patch
@@ -1,4 +1,4 @@
-From: Felix Fietkau <nbd@openwrt.org>
+From: Felix Fietkau <nbd@nbd.name>
 Subject: [PATCH] bridge: no EAP forward
 
 When bridging, do not forward EAP frames to other ports, only deliver
diff --git a/target/linux/generic/patches-3.18/641-bridge_always_accept_eap.patch b/target/linux/generic/patches-3.18/641-bridge_always_accept_eap.patch
index 7d314ad84df..a822fb0dc93 100644
--- a/target/linux/generic/patches-3.18/641-bridge_always_accept_eap.patch
+++ b/target/linux/generic/patches-3.18/641-bridge_always_accept_eap.patch
@@ -1,4 +1,4 @@
-From: Felix Fietkau <nbd@openwrt.org>
+From: Felix Fietkau <nbd@nbd.name>
 Subject: [PATCH] bridge: always accept EAP
 
 Allow EAP frames to pass through bridges even in learning state. Fixes
diff --git a/target/linux/generic/patches-3.18/642-bridge_port_isolate.patch b/target/linux/generic/patches-3.18/642-bridge_port_isolate.patch
index df3a65781d8..d231f881b9c 100644
--- a/target/linux/generic/patches-3.18/642-bridge_port_isolate.patch
+++ b/target/linux/generic/patches-3.18/642-bridge_port_isolate.patch
@@ -1,4 +1,4 @@
-From: Felix Fietkau <nbd@openwrt.org>
+From: Felix Fietkau <nbd@nbd.name>
 Subject: [PATCH] bridge: port isolate
 
 Isolating individual bridge ports
diff --git a/target/linux/generic/patches-3.18/645-bridge_multicast_to_unicast.patch b/target/linux/generic/patches-3.18/645-bridge_multicast_to_unicast.patch
index e23a6c4a1e5..1226770a3b4 100644
--- a/target/linux/generic/patches-3.18/645-bridge_multicast_to_unicast.patch
+++ b/target/linux/generic/patches-3.18/645-bridge_multicast_to_unicast.patch
@@ -1,4 +1,4 @@
-From: Felix Fietkau <nbd@openwrt.org>
+From: Felix Fietkau <nbd@nbd.name>
 Subject: [PATCH] bridge: multicast to unicast
 
 Implement optinal multicast->unicast conversion for igmp snooping
diff --git a/target/linux/generic/patches-3.18/680-NET-skip-GRO-for-foreign-MAC-addresses.patch b/target/linux/generic/patches-3.18/680-NET-skip-GRO-for-foreign-MAC-addresses.patch
index 21199fe6c74..714097bca06 100644
--- a/target/linux/generic/patches-3.18/680-NET-skip-GRO-for-foreign-MAC-addresses.patch
+++ b/target/linux/generic/patches-3.18/680-NET-skip-GRO-for-foreign-MAC-addresses.patch
@@ -13,7 +13,7 @@ a mask of changed bits in MAC addresses of upper devices. This allows
 handling VLANs and bridge devices with different addresses (as long as
 they are not too different).
 
-Signed-off-by: Felix Fietkau <nbd@openwrt.org>
+Signed-off-by: Felix Fietkau <nbd@nbd.name>
 
 --- a/net/core/dev.c
 +++ b/net/core/dev.c
diff --git a/target/linux/generic/patches-3.18/930-crashlog.patch b/target/linux/generic/patches-3.18/930-crashlog.patch
index 6615db5466d..9b0eb732df2 100644
--- a/target/linux/generic/patches-3.18/930-crashlog.patch
+++ b/target/linux/generic/patches-3.18/930-crashlog.patch
@@ -46,7 +46,7 @@
 @@ -0,0 +1,181 @@
 +/*
 + * Crash information logger
-+ * Copyright (C) 2010 Felix Fietkau <nbd@openwrt.org>
++ * Copyright (C) 2010 Felix Fietkau <nbd@nbd.name>
 + *
 + * Based on ramoops.c
 + *   Copyright (C) 2010 Marco Stornelli <marco.stornelli@gmail.com>
diff --git a/target/linux/generic/patches-4.1/072-13-bgmac-fix-MAC-soft-reset-bit-for-corerev-4.patch b/target/linux/generic/patches-4.1/072-13-bgmac-fix-MAC-soft-reset-bit-for-corerev-4.patch
index a3d9fd6cd9b..512df943e96 100644
--- a/target/linux/generic/patches-4.1/072-13-bgmac-fix-MAC-soft-reset-bit-for-corerev-4.patch
+++ b/target/linux/generic/patches-4.1/072-13-bgmac-fix-MAC-soft-reset-bit-for-corerev-4.patch
@@ -1,10 +1,10 @@
-From: Felix Fietkau <nbd@openwrt.org>
+From: Felix Fietkau <nbd@nbd.name>
 Date: Mon, 13 Apr 2015 15:54:04 +0200
 Subject: [PATCH] bgmac: fix MAC soft-reset bit for corerev > 4
 
 Only core revisions older than 4 use BGMAC_CMDCFG_SR_REV0
 
-Signed-off-by: Felix Fietkau <nbd@openwrt.org>
+Signed-off-by: Felix Fietkau <nbd@nbd.name>
 ---
 
 --- a/drivers/net/ethernet/broadcom/bgmac.h
diff --git a/target/linux/generic/patches-4.1/072-14-bgmac-reset-all-4-GMAC-cores-on-init.patch b/target/linux/generic/patches-4.1/072-14-bgmac-reset-all-4-GMAC-cores-on-init.patch
index 2a913a60e71..ddba71d4309 100644
--- a/target/linux/generic/patches-4.1/072-14-bgmac-reset-all-4-GMAC-cores-on-init.patch
+++ b/target/linux/generic/patches-4.1/072-14-bgmac-reset-all-4-GMAC-cores-on-init.patch
@@ -1,4 +1,4 @@
-From: Felix Fietkau <nbd@openwrt.org>
+From: Felix Fietkau <nbd@nbd.name>
 Date: Mon, 13 Apr 2015 15:56:26 +0200
 Subject: [PATCH] bgmac: reset all 4 GMAC cores on init
 
@@ -7,7 +7,7 @@ probe time, but only become usable after a full reset.
 Disable cores before re-enabling them to ensure that they are properly
 reset.
 
-Signed-off-by: Felix Fietkau <nbd@openwrt.org>
+Signed-off-by: Felix Fietkau <nbd@nbd.name>
 ---
 
 --- a/drivers/net/ethernet/broadcom/bgmac.c
diff --git a/target/linux/generic/patches-4.1/103-packet_allow_empty_payload.patch b/target/linux/generic/patches-4.1/103-packet_allow_empty_payload.patch
index bad5b34e658..2b9c4b00a2e 100644
--- a/target/linux/generic/patches-4.1/103-packet_allow_empty_payload.patch
+++ b/target/linux/generic/patches-4.1/103-packet_allow_empty_payload.patch
@@ -2,7 +2,7 @@ Fix a regression in the af_packet code that was breaking PPPoE
 
 pppd sends packets with only a header and no payload.
 
-Signed-off-by: Felix Fietkau <nbd@openwrt.org>
+Signed-off-by: Felix Fietkau <nbd@nbd.name>
 
 --- a/net/packet/af_packet.c
 +++ b/net/packet/af_packet.c
diff --git a/target/linux/generic/patches-4.1/110-jffs2-use-.rename2-and-add-RENAME_WHITEOUT-support.patch b/target/linux/generic/patches-4.1/110-jffs2-use-.rename2-and-add-RENAME_WHITEOUT-support.patch
index 9d32777feaf..c5d8321b85e 100644
--- a/target/linux/generic/patches-4.1/110-jffs2-use-.rename2-and-add-RENAME_WHITEOUT-support.patch
+++ b/target/linux/generic/patches-4.1/110-jffs2-use-.rename2-and-add-RENAME_WHITEOUT-support.patch
@@ -1,10 +1,10 @@
-From: Felix Fietkau <nbd@openwrt.org>
+From: Felix Fietkau <nbd@nbd.name>
 Date: Fri, 10 Apr 2015 13:35:29 +0200
 Subject: [PATCH] jffs2: use .rename2 and add RENAME_WHITEOUT support
 
 It is required for renames on overlayfs
 
-Signed-off-by: Felix Fietkau <nbd@openwrt.org>
+Signed-off-by: Felix Fietkau <nbd@nbd.name>
 ---
 
 --- a/fs/jffs2/dir.c
diff --git a/target/linux/generic/patches-4.1/111-jffs2-add-RENAME_EXCHANGE-support.patch b/target/linux/generic/patches-4.1/111-jffs2-add-RENAME_EXCHANGE-support.patch
index 3cc7b90f29e..0e1842186ac 100644
--- a/target/linux/generic/patches-4.1/111-jffs2-add-RENAME_EXCHANGE-support.patch
+++ b/target/linux/generic/patches-4.1/111-jffs2-add-RENAME_EXCHANGE-support.patch
@@ -1,8 +1,8 @@
-From: Felix Fietkau <nbd@openwrt.org>
+From: Felix Fietkau <nbd@nbd.name>
 Date: Sat, 25 Apr 2015 12:41:32 +0200
 Subject: [PATCH] jffs2: add RENAME_EXCHANGE support
 
-Signed-off-by: Felix Fietkau <nbd@openwrt.org>
+Signed-off-by: Felix Fietkau <nbd@nbd.name>
 ---
 
 --- a/fs/jffs2/dir.c
diff --git a/target/linux/generic/patches-4.1/120-bridge_allow_receiption_on_disabled_port.patch b/target/linux/generic/patches-4.1/120-bridge_allow_receiption_on_disabled_port.patch
index 5cd2f570cf5..41e322850fd 100644
--- a/target/linux/generic/patches-4.1/120-bridge_allow_receiption_on_disabled_port.patch
+++ b/target/linux/generic/patches-4.1/120-bridge_allow_receiption_on_disabled_port.patch
@@ -11,7 +11,7 @@ block forwarding packets from these disabled ports, but there is no
 hard requirement to not allow local packet delivery.
 
 Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>
-Signed-off-by: Felix Fietkau <nbd@openwrt.org>
+Signed-off-by: Felix Fietkau <nbd@nbd.name>
 
 --- a/net/bridge/br_input.c
 +++ b/net/bridge/br_input.c
diff --git a/target/linux/generic/patches-4.1/132-mips_inline_dma_ops.patch b/target/linux/generic/patches-4.1/132-mips_inline_dma_ops.patch
index f7543cca73b..0b38d9c699b 100644
--- a/target/linux/generic/patches-4.1/132-mips_inline_dma_ops.patch
+++ b/target/linux/generic/patches-4.1/132-mips_inline_dma_ops.patch
@@ -1,5 +1,5 @@
 From 2c58080407554e1bac8fd50d23cb02420524caed Mon Sep 17 00:00:00 2001
-From: Felix Fietkau <nbd@openwrt.org>
+From: Felix Fietkau <nbd@nbd.name>
 Date: Mon, 12 Aug 2013 12:50:22 +0200
 Subject: [PATCH] MIPS: partially inline dma ops
 
@@ -10,7 +10,7 @@ unnecessary code.
 Inlining visibly improves network performance in my tests (on a 24Kc
 based system), and also slightly reduces code size of a few drivers.
 
-Signed-off-by: Felix Fietkau <nbd@openwrt.org>
+Signed-off-by: Felix Fietkau <nbd@nbd.name>
 ---
  arch/mips/Kconfig                   |   4 +
  arch/mips/include/asm/dma-mapping.h | 360 +++++++++++++++++++++++++++++++++++-
diff --git a/target/linux/generic/patches-4.1/141-Revert-mtd-spi-nor-disable-protection-for-Winbond-fl.patch b/target/linux/generic/patches-4.1/141-Revert-mtd-spi-nor-disable-protection-for-Winbond-fl.patch
index 10b43d51bc1..3d4b64ea6f0 100644
--- a/target/linux/generic/patches-4.1/141-Revert-mtd-spi-nor-disable-protection-for-Winbond-fl.patch
+++ b/target/linux/generic/patches-4.1/141-Revert-mtd-spi-nor-disable-protection-for-Winbond-fl.patch
@@ -1,4 +1,4 @@
-From: Felix Fietkau <nbd@openwrt.org>
+From: Felix Fietkau <nbd@nbd.name>
 Date: Thu, 26 Nov 2015 17:03:46 +0100
 Subject: [PATCH] Revert "mtd: spi-nor: disable protection for Winbond flash at
  startup"
@@ -10,7 +10,7 @@ possibly other Spansion flash chips.
 
 Any mtd read seems to succeed, but simply returns a zero-filled buffer.
 
-Signed-off-by: Felix Fietkau <nbd@openwrt.org>
+Signed-off-by: Felix Fietkau <nbd@nbd.name>
 ---
 
 --- a/drivers/mtd/spi-nor/spi-nor.c
diff --git a/target/linux/generic/patches-4.1/204-module_strip.patch b/target/linux/generic/patches-4.1/204-module_strip.patch
index ab2fd17c2b4..e46421ac902 100644
--- a/target/linux/generic/patches-4.1/204-module_strip.patch
+++ b/target/linux/generic/patches-4.1/204-module_strip.patch
@@ -1,7 +1,7 @@
-From: Felix Fietkau <nbd@openwrt.org>
+From: Felix Fietkau <nbd@nbd.name>
 Subject: [PATCH] build: add a hack for removing non-essential module info
 
-Signed-off-by: Felix Fietkau <nbd@openwrt.org>
+Signed-off-by: Felix Fietkau <nbd@nbd.name>
 ---
 --- a/include/linux/module.h
 +++ b/include/linux/module.h
diff --git a/target/linux/generic/patches-4.1/220-gc_sections.patch b/target/linux/generic/patches-4.1/220-gc_sections.patch
index 98e1193e567..832be4fcf04 100644
--- a/target/linux/generic/patches-4.1/220-gc_sections.patch
+++ b/target/linux/generic/patches-4.1/220-gc_sections.patch
@@ -1,11 +1,11 @@
-From: Felix Fietkau <nbd@openwrt.org>
+From: Felix Fietkau <nbd@nbd.name>
 
 use -ffunction-sections, -fdata-sections and --gc-sections
 
 In combination with kernel symbol export stripping this significantly reduces
 the kernel image size. Used on both ARM and MIPS architectures.
 
-Signed-off-by: Felix Fietkau <nbd@openwrt.org>
+Signed-off-by: Felix Fietkau <nbd@nbd.name>
 Signed-off-by: Jonas Gorski <jogo@openwrt.org>
 Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
 ---
diff --git a/target/linux/generic/patches-4.1/307-mips_highmem_offset.patch b/target/linux/generic/patches-4.1/307-mips_highmem_offset.patch
index c9f0c84e301..5a7dc9cee9f 100644
--- a/target/linux/generic/patches-4.1/307-mips_highmem_offset.patch
+++ b/target/linux/generic/patches-4.1/307-mips_highmem_offset.patch
@@ -2,7 +2,7 @@ Adjust highmem offset to 0x10000000 to ensure that all kmalloc allocations
 stay within the same 256M boundary. This ensures that -mlong-calls is not
 needed on systems with more than 256M RAM.
 
-Signed-off-by: Felix Fietkau <nbd@openwrt.org>
+Signed-off-by: Felix Fietkau <nbd@nbd.name>
 ---
 --- a/arch/mips/include/asm/mach-generic/spaces.h
 +++ b/arch/mips/include/asm/mach-generic/spaces.h
diff --git a/target/linux/generic/patches-4.1/465-m25p80-mx-disable-software-protection.patch b/target/linux/generic/patches-4.1/465-m25p80-mx-disable-software-protection.patch
index e977e41a4b4..1d62b4f7181 100644
--- a/target/linux/generic/patches-4.1/465-m25p80-mx-disable-software-protection.patch
+++ b/target/linux/generic/patches-4.1/465-m25p80-mx-disable-software-protection.patch
@@ -1,6 +1,6 @@
 Disable software protection bits for Macronix flashes.
 
-Signed-off-by: Felix Fietkau <nbd@openwrt.org>
+Signed-off-by: Felix Fietkau <nbd@nbd.name>
 
 --- a/drivers/mtd/spi-nor/spi-nor.c
 +++ b/drivers/mtd/spi-nor/spi-nor.c
diff --git a/target/linux/generic/patches-4.1/630-packet_socket_type.patch b/target/linux/generic/patches-4.1/630-packet_socket_type.patch
index 3b284f171ff..a52c45413ef 100644
--- a/target/linux/generic/patches-4.1/630-packet_socket_type.patch
+++ b/target/linux/generic/patches-4.1/630-packet_socket_type.patch
@@ -3,7 +3,7 @@ broadcast, unicast, etc.) on packet sockets via setsockopt.
 This can reduce the load in situations where only a limited number
 of packet types are necessary
 
-Signed-off-by: Felix Fietkau <nbd@openwrt.org>
+Signed-off-by: Felix Fietkau <nbd@nbd.name>
 
 --- a/include/uapi/linux/if_packet.h
 +++ b/include/uapi/linux/if_packet.h
diff --git a/target/linux/generic/patches-4.1/640-bridge_no_eap_forward.patch b/target/linux/generic/patches-4.1/640-bridge_no_eap_forward.patch
index de52c020b42..2b55f13bbc4 100644
--- a/target/linux/generic/patches-4.1/640-bridge_no_eap_forward.patch
+++ b/target/linux/generic/patches-4.1/640-bridge_no_eap_forward.patch
@@ -1,4 +1,4 @@
-From: Felix Fietkau <nbd@openwrt.org>
+From: Felix Fietkau <nbd@nbd.name>
 Subject: [PATCH] bridge: no EAP forward
 
 When bridging, do not forward EAP frames to other ports, only deliver
diff --git a/target/linux/generic/patches-4.1/641-bridge_always_accept_eap.patch b/target/linux/generic/patches-4.1/641-bridge_always_accept_eap.patch
index 61f96e5ca7f..a4b3ed48a31 100644
--- a/target/linux/generic/patches-4.1/641-bridge_always_accept_eap.patch
+++ b/target/linux/generic/patches-4.1/641-bridge_always_accept_eap.patch
@@ -1,4 +1,4 @@
-From: Felix Fietkau <nbd@openwrt.org>
+From: Felix Fietkau <nbd@nbd.name>
 Subject: [PATCH] bridge: always accept EAP
 
 Allow EAP frames to pass through bridges even in learning state. Fixes
diff --git a/target/linux/generic/patches-4.1/642-bridge_port_isolate.patch b/target/linux/generic/patches-4.1/642-bridge_port_isolate.patch
index 13f84ae13eb..d7ae041b257 100644
--- a/target/linux/generic/patches-4.1/642-bridge_port_isolate.patch
+++ b/target/linux/generic/patches-4.1/642-bridge_port_isolate.patch
@@ -1,4 +1,4 @@
-From: Felix Fietkau <nbd@openwrt.org>
+From: Felix Fietkau <nbd@nbd.name>
 Subject: [PATCH] bridge: port isolate
 
 Isolating individual bridge ports
diff --git a/target/linux/generic/patches-4.1/645-bridge_multicast_to_unicast.patch b/target/linux/generic/patches-4.1/645-bridge_multicast_to_unicast.patch
index 1ea6fc60e0f..1361b92183c 100644
--- a/target/linux/generic/patches-4.1/645-bridge_multicast_to_unicast.patch
+++ b/target/linux/generic/patches-4.1/645-bridge_multicast_to_unicast.patch
@@ -1,4 +1,4 @@
-From: Felix Fietkau <nbd@openwrt.org>
+From: Felix Fietkau <nbd@nbd.name>
 Subject: [PATCH] bridge: multicast to unicast
 
 Implement optinal multicast->unicast conversion for igmp snooping
diff --git a/target/linux/generic/patches-4.1/680-NET-skip-GRO-for-foreign-MAC-addresses.patch b/target/linux/generic/patches-4.1/680-NET-skip-GRO-for-foreign-MAC-addresses.patch
index 716fb95d50c..a7cfa235211 100644
--- a/target/linux/generic/patches-4.1/680-NET-skip-GRO-for-foreign-MAC-addresses.patch
+++ b/target/linux/generic/patches-4.1/680-NET-skip-GRO-for-foreign-MAC-addresses.patch
@@ -13,7 +13,7 @@ a mask of changed bits in MAC addresses of upper devices. This allows
 handling VLANs and bridge devices with different addresses (as long as
 they are not too different).
 
-Signed-off-by: Felix Fietkau <nbd@openwrt.org>
+Signed-off-by: Felix Fietkau <nbd@nbd.name>
 
 --- a/net/core/dev.c
 +++ b/net/core/dev.c
diff --git a/target/linux/generic/patches-4.1/930-crashlog.patch b/target/linux/generic/patches-4.1/930-crashlog.patch
index 31c0aa53593..ca6cf110640 100644
--- a/target/linux/generic/patches-4.1/930-crashlog.patch
+++ b/target/linux/generic/patches-4.1/930-crashlog.patch
@@ -46,7 +46,7 @@
 @@ -0,0 +1,181 @@
 +/*
 + * Crash information logger
-+ * Copyright (C) 2010 Felix Fietkau <nbd@openwrt.org>
++ * Copyright (C) 2010 Felix Fietkau <nbd@nbd.name>
 + *
 + * Based on ramoops.c
 + *   Copyright (C) 2010 Marco Stornelli <marco.stornelli@gmail.com>
diff --git a/target/linux/generic/patches-4.4/010-Kbuild-don-t-hardcode-path-to-awk-in-scripts-ld-vers.patch b/target/linux/generic/patches-4.4/010-Kbuild-don-t-hardcode-path-to-awk-in-scripts-ld-vers.patch
index cb65ee360c3..f6c9d1edadf 100644
--- a/target/linux/generic/patches-4.4/010-Kbuild-don-t-hardcode-path-to-awk-in-scripts-ld-vers.patch
+++ b/target/linux/generic/patches-4.4/010-Kbuild-don-t-hardcode-path-to-awk-in-scripts-ld-vers.patch
@@ -1,11 +1,11 @@
-From: Felix Fietkau <nbd@openwrt.org>
+From: Felix Fietkau <nbd@nbd.name>
 Date: Mon, 18 Jan 2016 12:27:49 +0100
 Subject: [PATCH] Kbuild: don't hardcode path to awk in scripts/ld-version.sh
 
 On some systems /usr/bin/awk does not exist, or is broken. Find it via
 $PATH instead.
 
-Signed-off-by: Felix Fietkau <nbd@openwrt.org>
+Signed-off-by: Felix Fietkau <nbd@nbd.name>
 ---
 
 --- a/scripts/ld-version.sh
diff --git a/target/linux/generic/patches-4.4/072-bgmac-reset-enable-Ethernet-core-before-using-it.patch b/target/linux/generic/patches-4.4/072-bgmac-reset-enable-Ethernet-core-before-using-it.patch
index d643b1827e8..1306072c84a 100644
--- a/target/linux/generic/patches-4.4/072-bgmac-reset-enable-Ethernet-core-before-using-it.patch
+++ b/target/linux/generic/patches-4.4/072-bgmac-reset-enable-Ethernet-core-before-using-it.patch
@@ -10,7 +10,7 @@ This fixes Ethernet on D-Link DIR-885L with BCM47094 SoC. Felix reported
 similar fix was needed for his BCM4709 device (Buffalo WXR-1900DHP?).
 I tested this for regressions on BCM4706, BCM4708A0 and BCM47081A0.
 
-Cc: Felix Fietkau <nbd@openwrt.org>
+Cc: Felix Fietkau <nbd@nbd.name>
 Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
 Signed-off-by: David S. Miller <davem@davemloft.net>
 ---
diff --git a/target/linux/generic/patches-4.4/073-bgmac-fix-MAC-soft-reset-bit-for-corerev-4.patch b/target/linux/generic/patches-4.4/073-bgmac-fix-MAC-soft-reset-bit-for-corerev-4.patch
index 0dd1a3d4e71..a5fcaab51c9 100644
--- a/target/linux/generic/patches-4.4/073-bgmac-fix-MAC-soft-reset-bit-for-corerev-4.patch
+++ b/target/linux/generic/patches-4.4/073-bgmac-fix-MAC-soft-reset-bit-for-corerev-4.patch
@@ -1,5 +1,5 @@
 From c02bc350f9dbce7d637c394a6e1c4d29dc5b28b2 Mon Sep 17 00:00:00 2001
-From: Felix Fietkau <nbd@openwrt.org>
+From: Felix Fietkau <nbd@nbd.name>
 Date: Tue, 12 Apr 2016 18:27:29 +0200
 Subject: [PATCH] bgmac: fix MAC soft-reset bit for corerev > 4
 MIME-Version: 1.0
@@ -12,7 +12,7 @@ only some devices as most of BCM4708A0KF-s got core rev 4).
 This was tested for regressions on BCM47094 which doesn't seem to care
 which bit gets used.
 
-Signed-off-by: Felix Fietkau <nbd@openwrt.org>
+Signed-off-by: Felix Fietkau <nbd@nbd.name>
 Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
 Signed-off-by: David S. Miller <davem@davemloft.net>
 ---
diff --git a/target/linux/generic/patches-4.4/101-MIPS-fix-cache-flushing-for-highmem-pages.patch b/target/linux/generic/patches-4.4/101-MIPS-fix-cache-flushing-for-highmem-pages.patch
index 6a6c581bc55..237f0e500cb 100644
--- a/target/linux/generic/patches-4.4/101-MIPS-fix-cache-flushing-for-highmem-pages.patch
+++ b/target/linux/generic/patches-4.4/101-MIPS-fix-cache-flushing-for-highmem-pages.patch
@@ -1,4 +1,4 @@
-From: Felix Fietkau <nbd@openwrt.org>
+From: Felix Fietkau <nbd@nbd.name>
 Date: Sun, 24 Jan 2016 01:03:51 +0100
 Subject: [PATCH] MIPS: fix cache flushing for highmem pages
 
@@ -10,7 +10,7 @@ Fix this by always flushing highmem pages using kmap/kunmap_atomic
 around the actual cache flush. This might be a bit inefficient, but at
 least it's stable.
 
-Signed-off-by: Felix Fietkau <nbd@openwrt.org>
+Signed-off-by: Felix Fietkau <nbd@nbd.name>
 ---
 
 --- a/arch/mips/mm/cache.c
diff --git a/target/linux/generic/patches-4.4/110-jffs2-use-.rename2-and-add-RENAME_WHITEOUT-support.patch b/target/linux/generic/patches-4.4/110-jffs2-use-.rename2-and-add-RENAME_WHITEOUT-support.patch
index d7850a85648..b7ff845343d 100644
--- a/target/linux/generic/patches-4.4/110-jffs2-use-.rename2-and-add-RENAME_WHITEOUT-support.patch
+++ b/target/linux/generic/patches-4.4/110-jffs2-use-.rename2-and-add-RENAME_WHITEOUT-support.patch
@@ -1,10 +1,10 @@
-From: Felix Fietkau <nbd@openwrt.org>
+From: Felix Fietkau <nbd@nbd.name>
 Date: Fri, 10 Apr 2015 13:35:29 +0200
 Subject: [PATCH] jffs2: use .rename2 and add RENAME_WHITEOUT support
 
 It is required for renames on overlayfs
 
-Signed-off-by: Felix Fietkau <nbd@openwrt.org>
+Signed-off-by: Felix Fietkau <nbd@nbd.name>
 ---
 
 --- a/fs/jffs2/dir.c
diff --git a/target/linux/generic/patches-4.4/111-jffs2-add-RENAME_EXCHANGE-support.patch b/target/linux/generic/patches-4.4/111-jffs2-add-RENAME_EXCHANGE-support.patch
index d7188856545..b62408717e4 100644
--- a/target/linux/generic/patches-4.4/111-jffs2-add-RENAME_EXCHANGE-support.patch
+++ b/target/linux/generic/patches-4.4/111-jffs2-add-RENAME_EXCHANGE-support.patch
@@ -1,8 +1,8 @@
-From: Felix Fietkau <nbd@openwrt.org>
+From: Felix Fietkau <nbd@nbd.name>
 Date: Sat, 25 Apr 2015 12:41:32 +0200
 Subject: [PATCH] jffs2: add RENAME_EXCHANGE support
 
-Signed-off-by: Felix Fietkau <nbd@openwrt.org>
+Signed-off-by: Felix Fietkau <nbd@nbd.name>
 ---
 
 --- a/fs/jffs2/dir.c
diff --git a/target/linux/generic/patches-4.4/120-bridge_allow_receiption_on_disabled_port.patch b/target/linux/generic/patches-4.4/120-bridge_allow_receiption_on_disabled_port.patch
index 1e4955bce65..727ab752e96 100644
--- a/target/linux/generic/patches-4.4/120-bridge_allow_receiption_on_disabled_port.patch
+++ b/target/linux/generic/patches-4.4/120-bridge_allow_receiption_on_disabled_port.patch
@@ -11,7 +11,7 @@ block forwarding packets from these disabled ports, but there is no
 hard requirement to not allow local packet delivery.
 
 Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>
-Signed-off-by: Felix Fietkau <nbd@openwrt.org>
+Signed-off-by: Felix Fietkau <nbd@nbd.name>
 
 --- a/net/bridge/br_input.c
 +++ b/net/bridge/br_input.c
diff --git a/target/linux/generic/patches-4.4/132-mips_inline_dma_ops.patch b/target/linux/generic/patches-4.4/132-mips_inline_dma_ops.patch
index c987ccc6b01..bf7dca6a334 100644
--- a/target/linux/generic/patches-4.4/132-mips_inline_dma_ops.patch
+++ b/target/linux/generic/patches-4.4/132-mips_inline_dma_ops.patch
@@ -1,5 +1,5 @@
 From 2c58080407554e1bac8fd50d23cb02420524caed Mon Sep 17 00:00:00 2001
-From: Felix Fietkau <nbd@openwrt.org>
+From: Felix Fietkau <nbd@nbd.name>
 Date: Mon, 12 Aug 2013 12:50:22 +0200
 Subject: [PATCH] MIPS: partially inline dma ops
 
@@ -10,7 +10,7 @@ unnecessary code.
 Inlining visibly improves network performance in my tests (on a 24Kc
 based system), and also slightly reduces code size of a few drivers.
 
-Signed-off-by: Felix Fietkau <nbd@openwrt.org>
+Signed-off-by: Felix Fietkau <nbd@nbd.name>
 ---
  arch/mips/Kconfig                   |   4 +
  arch/mips/include/asm/dma-mapping.h | 360 +++++++++++++++++++++++++++++++++++-
diff --git a/target/linux/generic/patches-4.4/204-module_strip.patch b/target/linux/generic/patches-4.4/204-module_strip.patch
index 225fc6927ed..f51f14c3074 100644
--- a/target/linux/generic/patches-4.4/204-module_strip.patch
+++ b/target/linux/generic/patches-4.4/204-module_strip.patch
@@ -1,7 +1,7 @@
-From: Felix Fietkau <nbd@openwrt.org>
+From: Felix Fietkau <nbd@nbd.name>
 Subject: [PATCH] build: add a hack for removing non-essential module info
 
-Signed-off-by: Felix Fietkau <nbd@openwrt.org>
+Signed-off-by: Felix Fietkau <nbd@nbd.name>
 ---
 --- a/include/linux/module.h
 +++ b/include/linux/module.h
diff --git a/target/linux/generic/patches-4.4/206-mips-disable-vdso.patch b/target/linux/generic/patches-4.4/206-mips-disable-vdso.patch
index 9b1346db81a..1abe78f1418 100644
--- a/target/linux/generic/patches-4.4/206-mips-disable-vdso.patch
+++ b/target/linux/generic/patches-4.4/206-mips-disable-vdso.patch
@@ -1,6 +1,6 @@
 Disable MIPS VDSO until the cache issues have been sorted out.
 
-Signed-off-by: Felix Fietkau <nbd@openwrt.org>
+Signed-off-by: Felix Fietkau <nbd@nbd.name>
 
 --- a/arch/mips/vdso/Makefile
 +++ b/arch/mips/vdso/Makefile
diff --git a/target/linux/generic/patches-4.4/220-gc_sections.patch b/target/linux/generic/patches-4.4/220-gc_sections.patch
index e89ef77d903..6c8fa3b4c94 100644
--- a/target/linux/generic/patches-4.4/220-gc_sections.patch
+++ b/target/linux/generic/patches-4.4/220-gc_sections.patch
@@ -1,11 +1,11 @@
-From: Felix Fietkau <nbd@openwrt.org>
+From: Felix Fietkau <nbd@nbd.name>
 
 use -ffunction-sections, -fdata-sections and --gc-sections
 
 In combination with kernel symbol export stripping this significantly reduces
 the kernel image size. Used on both ARM and MIPS architectures.
 
-Signed-off-by: Felix Fietkau <nbd@openwrt.org>
+Signed-off-by: Felix Fietkau <nbd@nbd.name>
 Signed-off-by: Jonas Gorski <jogo@openwrt.org>
 Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
 ---
diff --git a/target/linux/generic/patches-4.4/307-mips_highmem_offset.patch b/target/linux/generic/patches-4.4/307-mips_highmem_offset.patch
index c9f0c84e301..5a7dc9cee9f 100644
--- a/target/linux/generic/patches-4.4/307-mips_highmem_offset.patch
+++ b/target/linux/generic/patches-4.4/307-mips_highmem_offset.patch
@@ -2,7 +2,7 @@ Adjust highmem offset to 0x10000000 to ensure that all kmalloc allocations
 stay within the same 256M boundary. This ensures that -mlong-calls is not
 needed on systems with more than 256M RAM.
 
-Signed-off-by: Felix Fietkau <nbd@openwrt.org>
+Signed-off-by: Felix Fietkau <nbd@nbd.name>
 ---
 --- a/arch/mips/include/asm/mach-generic/spaces.h
 +++ b/arch/mips/include/asm/mach-generic/spaces.h
diff --git a/target/linux/generic/patches-4.4/465-m25p80-mx-disable-software-protection.patch b/target/linux/generic/patches-4.4/465-m25p80-mx-disable-software-protection.patch
index cc2103b2e86..726e4d1a965 100644
--- a/target/linux/generic/patches-4.4/465-m25p80-mx-disable-software-protection.patch
+++ b/target/linux/generic/patches-4.4/465-m25p80-mx-disable-software-protection.patch
@@ -1,6 +1,6 @@
 Disable software protection bits for Macronix flashes.
 
-Signed-off-by: Felix Fietkau <nbd@openwrt.org>
+Signed-off-by: Felix Fietkau <nbd@nbd.name>
 
 --- a/drivers/mtd/spi-nor/spi-nor.c
 +++ b/drivers/mtd/spi-nor/spi-nor.c
diff --git a/target/linux/generic/patches-4.4/630-packet_socket_type.patch b/target/linux/generic/patches-4.4/630-packet_socket_type.patch
index 4106da78a8b..a7ffccc2a63 100644
--- a/target/linux/generic/patches-4.4/630-packet_socket_type.patch
+++ b/target/linux/generic/patches-4.4/630-packet_socket_type.patch
@@ -3,7 +3,7 @@ broadcast, unicast, etc.) on packet sockets via setsockopt.
 This can reduce the load in situations where only a limited number
 of packet types are necessary
 
-Signed-off-by: Felix Fietkau <nbd@openwrt.org>
+Signed-off-by: Felix Fietkau <nbd@nbd.name>
 
 --- a/include/uapi/linux/if_packet.h
 +++ b/include/uapi/linux/if_packet.h
diff --git a/target/linux/generic/patches-4.4/640-bridge_no_eap_forward.patch b/target/linux/generic/patches-4.4/640-bridge_no_eap_forward.patch
index 1fc101c5c47..24cc2b29618 100644
--- a/target/linux/generic/patches-4.4/640-bridge_no_eap_forward.patch
+++ b/target/linux/generic/patches-4.4/640-bridge_no_eap_forward.patch
@@ -1,4 +1,4 @@
-From: Felix Fietkau <nbd@openwrt.org>
+From: Felix Fietkau <nbd@nbd.name>
 Subject: [PATCH] bridge: no EAP forward
 
 When bridging, do not forward EAP frames to other ports, only deliver
diff --git a/target/linux/generic/patches-4.4/641-bridge_always_accept_eap.patch b/target/linux/generic/patches-4.4/641-bridge_always_accept_eap.patch
index 0ff8e737d3c..5da6ab64a17 100644
--- a/target/linux/generic/patches-4.4/641-bridge_always_accept_eap.patch
+++ b/target/linux/generic/patches-4.4/641-bridge_always_accept_eap.patch
@@ -1,4 +1,4 @@
-From: Felix Fietkau <nbd@openwrt.org>
+From: Felix Fietkau <nbd@nbd.name>
 Subject: [PATCH] bridge: always accept EAP
 
 Allow EAP frames to pass through bridges even in learning state. Fixes
diff --git a/target/linux/generic/patches-4.4/642-bridge_port_isolate.patch b/target/linux/generic/patches-4.4/642-bridge_port_isolate.patch
index 1f1cb1d394a..3ece047317e 100644
--- a/target/linux/generic/patches-4.4/642-bridge_port_isolate.patch
+++ b/target/linux/generic/patches-4.4/642-bridge_port_isolate.patch
@@ -1,4 +1,4 @@
-From: Felix Fietkau <nbd@openwrt.org>
+From: Felix Fietkau <nbd@nbd.name>
 Subject: [PATCH] bridge: port isolate
 
 Isolating individual bridge ports
diff --git a/target/linux/generic/patches-4.4/645-bridge_multicast_to_unicast.patch b/target/linux/generic/patches-4.4/645-bridge_multicast_to_unicast.patch
index 9b2ff3fc762..bab091262c8 100644
--- a/target/linux/generic/patches-4.4/645-bridge_multicast_to_unicast.patch
+++ b/target/linux/generic/patches-4.4/645-bridge_multicast_to_unicast.patch
@@ -1,4 +1,4 @@
-From: Felix Fietkau <nbd@openwrt.org>
+From: Felix Fietkau <nbd@nbd.name>
 Subject: [PATCH] bridge: multicast to unicast
 
 Implement optinal multicast->unicast conversion for igmp snooping
diff --git a/target/linux/generic/patches-4.4/680-NET-skip-GRO-for-foreign-MAC-addresses.patch b/target/linux/generic/patches-4.4/680-NET-skip-GRO-for-foreign-MAC-addresses.patch
index a9ea04a43db..a658bfe9d15 100644
--- a/target/linux/generic/patches-4.4/680-NET-skip-GRO-for-foreign-MAC-addresses.patch
+++ b/target/linux/generic/patches-4.4/680-NET-skip-GRO-for-foreign-MAC-addresses.patch
@@ -13,7 +13,7 @@ a mask of changed bits in MAC addresses of upper devices. This allows
 handling VLANs and bridge devices with different addresses (as long as
 they are not too different).
 
-Signed-off-by: Felix Fietkau <nbd@openwrt.org>
+Signed-off-by: Felix Fietkau <nbd@nbd.name>
 
 --- a/net/core/dev.c
 +++ b/net/core/dev.c
diff --git a/target/linux/generic/patches-4.4/681-NET-add-of_get_mac_address_mtd.patch b/target/linux/generic/patches-4.4/681-NET-add-of_get_mac_address_mtd.patch
index 5b1a9ceaebd..2044872973f 100644
--- a/target/linux/generic/patches-4.4/681-NET-add-of_get_mac_address_mtd.patch
+++ b/target/linux/generic/patches-4.4/681-NET-add-of_get_mac_address_mtd.patch
@@ -8,7 +8,7 @@ network interface. The new property points at a mtd partition with an offset
 where the mac address can be found.
 
 Signed-off-by: John Crispin <blogic@openwrt.org>
-Signed-off-by: Felix Fietkau <nbd@openwrt.org>
+Signed-off-by: Felix Fietkau <nbd@nbd.name>
 ---
  drivers/of/of_net.c    |   37 +++++++++++++++++++++++++++++++++++++
  include/linux/of_net.h |    1 +
diff --git a/target/linux/generic/patches-4.4/930-crashlog.patch b/target/linux/generic/patches-4.4/930-crashlog.patch
index 514ff469d8d..27a7f6ab351 100644
--- a/target/linux/generic/patches-4.4/930-crashlog.patch
+++ b/target/linux/generic/patches-4.4/930-crashlog.patch
@@ -46,7 +46,7 @@
 @@ -0,0 +1,181 @@
 +/*
 + * Crash information logger
-+ * Copyright (C) 2010 Felix Fietkau <nbd@openwrt.org>
++ * Copyright (C) 2010 Felix Fietkau <nbd@nbd.name>
 + *
 + * Based on ramoops.c
 + *   Copyright (C) 2010 Marco Stornelli <marco.stornelli@gmail.com>
diff --git a/target/linux/ipq806x/patches-4.4/400-dsa-add-qca.patch b/target/linux/ipq806x/patches-4.4/400-dsa-add-qca.patch
index f1bdf1aa6fc..9457e1d8ad0 100644
--- a/target/linux/ipq806x/patches-4.4/400-dsa-add-qca.patch
+++ b/target/linux/ipq806x/patches-4.4/400-dsa-add-qca.patch
@@ -13,7 +13,7 @@ To: robh+dt@kernel.org, pawel.moll@arm.com, mark.rutland@arm.com,
  f.fainelli@gmail.com, linux@roeck-us.net, gang.chen.5i5j@gmail.com,
  jiri@resnulli.us, leitec@staticky.com, fabf@skynet.be,
  alexander.h.duyck@intel.com, pavel.nakonechny@skitlab.ru,
- joe@perches.com, sfeldma@gmail.com, nbd@openwrt.org, juhosg@openwrt.org
+ joe@perches.com, sfeldma@gmail.com, nbd@nbd.name, juhosg@openwrt.org
 Cc: devicetree@vger.kernel.org, linux-kernel@vger.kernel.org,
  netdev@vger.kernel.org
 Date: Thu, 28 May 2015 18:42:16 -0700
@@ -72,7 +72,7 @@ index 0000000..4ce3ffc
 +++ b/drivers/net/dsa/ar8xxx.c
 @@ -0,0 +1,303 @@
 +/*
-+ * Copyright (C) 2009 Felix Fietkau <nbd@openwrt.org>
++ * Copyright (C) 2009 Felix Fietkau <nbd@nbd.name>
 + * Copyright (C) 2011-2012 Gabor Juhos <juhosg@openwrt.org>
 + * Copyright (c) 2015, The Linux Foundation. All rights reserved.
 + *
@@ -381,7 +381,7 @@ index 0000000..a29b6d3
 +++ b/drivers/net/dsa/ar8xxx.h
 @@ -0,0 +1,82 @@
 +/*
-+ * Copyright (C) 2009 Felix Fietkau <nbd@openwrt.org>
++ * Copyright (C) 2009 Felix Fietkau <nbd@nbd.name>
 + * Copyright (C) 2011-2012 Gabor Juhos <juhosg@openwrt.org>
 + * Copyright (c) 2015, The Linux Foundation. All rights reserved.
 + *
@@ -490,7 +490,7 @@ To: robh+dt@kernel.org, pawel.moll@arm.com, mark.rutland@arm.com,
  f.fainelli@gmail.com, linux@roeck-us.net, gang.chen.5i5j@gmail.com,
  jiri@resnulli.us, leitec@staticky.com, fabf@skynet.be,
  alexander.h.duyck@intel.com, pavel.nakonechny@skitlab.ru,
- joe@perches.com, sfeldma@gmail.com, nbd@openwrt.org, juhosg@openwrt.org
+ joe@perches.com, sfeldma@gmail.com, nbd@nbd.name, juhosg@openwrt.org
 Cc: devicetree@vger.kernel.org, linux-kernel@vger.kernel.org,
  netdev@vger.kernel.org
 Date: Thu, 28 May 2015 18:42:17 -0700
@@ -742,7 +742,7 @@ To: robh+dt@kernel.org, pawel.moll@arm.com, mark.rutland@arm.com,
  f.fainelli@gmail.com, linux@roeck-us.net, gang.chen.5i5j@gmail.com,
  jiri@resnulli.us, leitec@staticky.com, fabf@skynet.be,
  alexander.h.duyck@intel.com, pavel.nakonechny@skitlab.ru,
- joe@perches.com, sfeldma@gmail.com, nbd@openwrt.org, juhosg@openwrt.org
+ joe@perches.com, sfeldma@gmail.com, nbd@nbd.name, juhosg@openwrt.org
 Cc: devicetree@vger.kernel.org, linux-kernel@vger.kernel.org,
  netdev@vger.kernel.org
 Date: Thu, 28 May 2015 18:42:18 -0700
@@ -893,7 +893,7 @@ To: robh+dt@kernel.org, pawel.moll@arm.com, mark.rutland@arm.com,
  f.fainelli@gmail.com, linux@roeck-us.net, gang.chen.5i5j@gmail.com,
  jiri@resnulli.us, leitec@staticky.com, fabf@skynet.be,
  alexander.h.duyck@intel.com, pavel.nakonechny@skitlab.ru,
- joe@perches.com, sfeldma@gmail.com, nbd@openwrt.org, juhosg@openwrt.org
+ joe@perches.com, sfeldma@gmail.com, nbd@nbd.name, juhosg@openwrt.org
 Cc: devicetree@vger.kernel.org, linux-kernel@vger.kernel.org,
  netdev@vger.kernel.org
 Date: Thu, 28 May 2015 18:42:19 -0700
@@ -1175,7 +1175,7 @@ To: robh+dt@kernel.org, pawel.moll@arm.com, mark.rutland@arm.com,
  f.fainelli@gmail.com, linux@roeck-us.net, gang.chen.5i5j@gmail.com,
  jiri@resnulli.us, leitec@staticky.com, fabf@skynet.be,
  alexander.h.duyck@intel.com, pavel.nakonechny@skitlab.ru,
- joe@perches.com, sfeldma@gmail.com, nbd@openwrt.org, juhosg@openwrt.org
+ joe@perches.com, sfeldma@gmail.com, nbd@nbd.name, juhosg@openwrt.org
 Cc: devicetree@vger.kernel.org, linux-kernel@vger.kernel.org,
  netdev@vger.kernel.org
 Date: Thu, 28 May 2015 18:42:20 -0700
@@ -1318,7 +1318,7 @@ To: robh+dt@kernel.org, pawel.moll@arm.com, mark.rutland@arm.com,
  f.fainelli@gmail.com, linux@roeck-us.net, gang.chen.5i5j@gmail.com,
  jiri@resnulli.us, leitec@staticky.com, fabf@skynet.be,
  alexander.h.duyck@intel.com, pavel.nakonechny@skitlab.ru,
- joe@perches.com, sfeldma@gmail.com, nbd@openwrt.org, juhosg@openwrt.org
+ joe@perches.com, sfeldma@gmail.com, nbd@nbd.name, juhosg@openwrt.org
 Cc: devicetree@vger.kernel.org, linux-kernel@vger.kernel.org,
  netdev@vger.kernel.org
 Date: Thu, 28 May 2015 18:42:21 -0700
@@ -1430,7 +1430,7 @@ To: robh+dt@kernel.org, pawel.moll@arm.com, mark.rutland@arm.com,
  f.fainelli@gmail.com, linux@roeck-us.net, gang.chen.5i5j@gmail.com,
  jiri@resnulli.us, leitec@staticky.com, fabf@skynet.be,
  alexander.h.duyck@intel.com, pavel.nakonechny@skitlab.ru,
- joe@perches.com, sfeldma@gmail.com, nbd@openwrt.org, juhosg@openwrt.org
+ joe@perches.com, sfeldma@gmail.com, nbd@nbd.name, juhosg@openwrt.org
 Cc: devicetree@vger.kernel.org, linux-kernel@vger.kernel.org,
  netdev@vger.kernel.org
 Date: Thu, 28 May 2015 18:42:22 -0700
diff --git a/target/linux/mediatek/patches-4.4/0049-net-next-mediatek-add-support-for-MT7623-ethernet.patch b/target/linux/mediatek/patches-4.4/0049-net-next-mediatek-add-support-for-MT7623-ethernet.patch
index 98b008399c6..85aa93d475f 100644
--- a/target/linux/mediatek/patches-4.4/0049-net-next-mediatek-add-support-for-MT7623-ethernet.patch
+++ b/target/linux/mediatek/patches-4.4/0049-net-next-mediatek-add-support-for-MT7623-ethernet.patch
@@ -16,7 +16,7 @@ the RX ring and data buffer. This is really needed to make the HW datapath
 work. Although the driver does not support this yet, we still need to
 assign the memory and tell the core about it for RX to work.
 
-Signed-off-by: Felix Fietkau <nbd@openwrt.org>
+Signed-off-by: Felix Fietkau <nbd@nbd.name>
 Signed-off-by: Michael Lee <igvtee@gmail.com>
 Signed-off-by: John Crispin <blogic@openwrt.org>
 ---
@@ -39,7 +39,7 @@ Signed-off-by: John Crispin <blogic@openwrt.org>
 + *   GNU General Public License for more details.
 + *
 + *   Copyright (C) 2009-2016 John Crispin <blogic@openwrt.org>
-+ *   Copyright (C) 2009-2016 Felix Fietkau <nbd@openwrt.org>
++ *   Copyright (C) 2009-2016 Felix Fietkau <nbd@nbd.name>
 + *   Copyright (C) 2013-2016 Michael Lee <igvtee@gmail.com>
 + */
 +
@@ -1849,7 +1849,7 @@ Signed-off-by: John Crispin <blogic@openwrt.org>
 + *   GNU General Public License for more details.
 + *
 + *   Copyright (C) 2009-2016 John Crispin <blogic@openwrt.org>
-+ *   Copyright (C) 2009-2016 Felix Fietkau <nbd@openwrt.org>
++ *   Copyright (C) 2009-2016 Felix Fietkau <nbd@nbd.name>
 + *   Copyright (C) 2013-2016 Michael Lee <igvtee@gmail.com>
 + */
 +
diff --git a/target/linux/mediatek/patches-4.4/0051-net-next-mediatek-add-an-entry-to-MAINTAINERS.patch b/target/linux/mediatek/patches-4.4/0051-net-next-mediatek-add-an-entry-to-MAINTAINERS.patch
index 59ed5fc7a88..0fc9b373e50 100644
--- a/target/linux/mediatek/patches-4.4/0051-net-next-mediatek-add-an-entry-to-MAINTAINERS.patch
+++ b/target/linux/mediatek/patches-4.4/0051-net-next-mediatek-add-an-entry-to-MAINTAINERS.patch
@@ -5,7 +5,7 @@ Subject: [PATCH 051/102] net-next: mediatek: add an entry to MAINTAINERS
 
 Add myself and Felix as the Maintainers for the MediaTek ethernet driver.
 
-Signed-off-by: Felix Fietkau <nbd@openwrt.org>
+Signed-off-by: Felix Fietkau <nbd@nbd.name>
 Signed-off-by: John Crispin <blogic@openwrt.org>
 ---
  MAINTAINERS |    7 +++++++
@@ -18,7 +18,7 @@ Signed-off-by: John Crispin <blogic@openwrt.org>
  F:	include/uapi/linux/uvcvideo.h
  
 +MEDIATEK ETHERNET DRIVER
-+M:	Felix Fietkau <nbd@openwrt.org>
++M:	Felix Fietkau <nbd@nbd.name>
 +M:	John Crispin <blogic@openwrt.org>
 +L:	netdev@vger.kernel.org
 +S:	Maintained
diff --git a/target/linux/mediatek/patches-4.4/0097-net-next-mediatek-change-my-email-address.patch b/target/linux/mediatek/patches-4.4/0097-net-next-mediatek-change-my-email-address.patch
index 2646018976c..472d58b55a7 100644
--- a/target/linux/mediatek/patches-4.4/0097-net-next-mediatek-change-my-email-address.patch
+++ b/target/linux/mediatek/patches-4.4/0097-net-next-mediatek-change-my-email-address.patch
@@ -18,7 +18,7 @@ Signed-off-by: John Crispin <john@phrozen.org>
   *
 - *   Copyright (C) 2009-2016 John Crispin <blogic@openwrt.org>
 + *   Copyright (C) 2009-2016 John Crispin <john@phrozen.org>
-  *   Copyright (C) 2009-2016 Felix Fietkau <nbd@openwrt.org>
+  *   Copyright (C) 2009-2016 Felix Fietkau <nbd@nbd.name>
   *   Copyright (C) 2013-2016 Michael Lee <igvtee@gmail.com>
   */
 @@ -1929,5 +1929,5 @@ static struct platform_driver mtk_driver
diff --git a/target/linux/mediatek/patches-4.4/0099-MAINTAINERS-change-my-email-address.patch b/target/linux/mediatek/patches-4.4/0099-MAINTAINERS-change-my-email-address.patch
index b23a55aa432..f0cf4ea7d22 100644
--- a/target/linux/mediatek/patches-4.4/0099-MAINTAINERS-change-my-email-address.patch
+++ b/target/linux/mediatek/patches-4.4/0099-MAINTAINERS-change-my-email-address.patch
@@ -15,7 +15,7 @@ Signed-off-by: John Crispin <john@phrozen.org>
 @@ -6909,7 +6909,7 @@ F:	include/uapi/linux/uvcvideo.h
  
  MEDIATEK ETHERNET DRIVER
- M:	Felix Fietkau <nbd@openwrt.org>
+ M:	Felix Fietkau <nbd@nbd.name>
 -M:	John Crispin <blogic@openwrt.org>
 +M:	John Crispin <john@phrozen.org>
  L:	netdev@vger.kernel.org
diff --git a/target/linux/mediatek/patches-4.4/0100-MAINTAINERS-add-Sean-as-mediatek-ethernet-maintainer.patch b/target/linux/mediatek/patches-4.4/0100-MAINTAINERS-add-Sean-as-mediatek-ethernet-maintainer.patch
index 95770605752..b3ebaf13e20 100644
--- a/target/linux/mediatek/patches-4.4/0100-MAINTAINERS-add-Sean-as-mediatek-ethernet-maintainer.patch
+++ b/target/linux/mediatek/patches-4.4/0100-MAINTAINERS-add-Sean-as-mediatek-ethernet-maintainer.patch
@@ -17,7 +17,7 @@ Signed-off-by: John Crispin <john@phrozen.org>
 +++ b/MAINTAINERS
 @@ -6910,6 +6910,7 @@ F:	include/uapi/linux/uvcvideo.h
  MEDIATEK ETHERNET DRIVER
- M:	Felix Fietkau <nbd@openwrt.org>
+ M:	Felix Fietkau <nbd@nbd.name>
  M:	John Crispin <john@phrozen.org>
 +M:	Sean Wang <keyhaede@gmail.com>
  L:	netdev@vger.kernel.org
diff --git a/target/linux/mediatek/patches-4.4/0101-net-mediatek-add-gsw-mt7530-driver.patch b/target/linux/mediatek/patches-4.4/0101-net-mediatek-add-gsw-mt7530-driver.patch
index fb13f9e5ef3..4d931fc0fa2 100644
--- a/target/linux/mediatek/patches-4.4/0101-net-mediatek-add-gsw-mt7530-driver.patch
+++ b/target/linux/mediatek/patches-4.4/0101-net-mediatek-add-gsw-mt7530-driver.patch
@@ -39,7 +39,7 @@ Signed-off-by: John Crispin <blogic@openwrt.org>
 + *   GNU General Public License for more details.
 + *
 + *   Copyright (C) 2009-2016 John Crispin <blogic@openwrt.org>
-+ *   Copyright (C) 2009-2016 Felix Fietkau <nbd@openwrt.org>
++ *   Copyright (C) 2009-2016 Felix Fietkau <nbd@nbd.name>
 + *   Copyright (C) 2013-2016 Michael Lee <igvtee@gmail.com>
 + */
 +
@@ -293,7 +293,7 @@ Signed-off-by: John Crispin <blogic@openwrt.org>
 + *   GNU General Public License for more details.
 + *
 + *   Copyright (C) 2009-2016 John Crispin <blogic@openwrt.org>
-+ *   Copyright (C) 2009-2016 Felix Fietkau <nbd@openwrt.org>
++ *   Copyright (C) 2009-2016 Felix Fietkau <nbd@nbd.name>
 + *   Copyright (C) 2013-2016 Michael Lee <igvtee@gmail.com>
 + */
 +
diff --git a/target/linux/mpc85xx/patches-4.4/200-spi-fsl-espi-preallocate-local-buffer.patch b/target/linux/mpc85xx/patches-4.4/200-spi-fsl-espi-preallocate-local-buffer.patch
index 3239cdb850c..f2a41e876bf 100644
--- a/target/linux/mpc85xx/patches-4.4/200-spi-fsl-espi-preallocate-local-buffer.patch
+++ b/target/linux/mpc85xx/patches-4.4/200-spi-fsl-espi-preallocate-local-buffer.patch
@@ -31,7 +31,7 @@ Preallocate the buffer from the probe routine to avoid
 this.
 
 Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
-Signed-off-by: Felix Fietkau <nbd@openwrt.org>
+Signed-off-by: Felix Fietkau <nbd@nbd.name>
 ---
  drivers/spi/spi-fsl-espi.c | 34 ++++++++++++++++------------------
  drivers/spi/spi-fsl-lib.h  |  1 +
diff --git a/target/linux/ramips/patches-4.4/0019-arch-mips-ralink-add-mt7621-cpu-feature-overrides.patch b/target/linux/ramips/patches-4.4/0019-arch-mips-ralink-add-mt7621-cpu-feature-overrides.patch
index d2da23a4ca9..a30e2f9a176 100644
--- a/target/linux/ramips/patches-4.4/0019-arch-mips-ralink-add-mt7621-cpu-feature-overrides.patch
+++ b/target/linux/ramips/patches-4.4/0019-arch-mips-ralink-add-mt7621-cpu-feature-overrides.patch
@@ -17,7 +17,7 @@ Signed-off-by: John Crispin <blogic@openwrt.org>
 + *
 + * Copyright (C) 2008-2009 Gabor Juhos <juhosg@openwrt.org>
 + * Copyright (C) 2008 Imre Kaloz <kaloz@openwrt.org>
-+ * Copyright (C) 2015 Felix Fietkau <nbd@openwrt.org>
++ * Copyright (C) 2015 Felix Fietkau <nbd@nbd.name>
 + *
 + * This file was derived from: include/asm-mips/cpu-features.h
 + *	Copyright (C) 2003, 2004 Ralf Baechle
diff --git a/target/linux/ramips/patches-4.4/0043-spi-add-mt7621-support.patch b/target/linux/ramips/patches-4.4/0043-spi-add-mt7621-support.patch
index 80f68df0964..8a78bda8403 100644
--- a/target/linux/ramips/patches-4.4/0043-spi-add-mt7621-support.patch
+++ b/target/linux/ramips/patches-4.4/0043-spi-add-mt7621-support.patch
@@ -44,7 +44,7 @@ Signed-off-by: John Crispin <blogic@openwrt.org>
 + *
 + * Copyright (C) 2011 Sergiy <piratfm@gmail.com>
 + * Copyright (C) 2011-2013 Gabor Juhos <juhosg@openwrt.org>
-+ * Copyright (C) 2014-2015 Felix Fietkau <nbd@openwrt.org>
++ * Copyright (C) 2014-2015 Felix Fietkau <nbd@nbd.name>
 + *
 + * Some parts are based on spi-orion.c:
 + *   Author: Shadi Ammouri <shadi@marvell.com>
@@ -520,5 +520,5 @@ Signed-off-by: John Crispin <blogic@openwrt.org>
 +module_platform_driver(mt7621_spi_driver);
 +
 +MODULE_DESCRIPTION("MT7621 SPI driver");
-+MODULE_AUTHOR("Felix Fietkau <nbd@openwrt.org>");
++MODULE_AUTHOR("Felix Fietkau <nbd@nbd.name>");
 +MODULE_LICENSE("GPL");
diff --git a/target/linux/ramips/patches-4.4/0500-Documentation-DT-net-add-docs-for-ralink-mediatek-So.patch b/target/linux/ramips/patches-4.4/0500-Documentation-DT-net-add-docs-for-ralink-mediatek-So.patch
index 2c726f6732e..7534c09b8b7 100644
--- a/target/linux/ramips/patches-4.4/0500-Documentation-DT-net-add-docs-for-ralink-mediatek-So.patch
+++ b/target/linux/ramips/patches-4.4/0500-Documentation-DT-net-add-docs-for-ralink-mediatek-So.patch
@@ -8,7 +8,7 @@ Add three files. ralink,rt2880-net.txt  descibes the actual frame engine
 and the other two describe the switch forntend bindings.
 
 Signed-off-by: John Crispin <blogic@openwrt.org>
-Signed-off-by: Felix Fietkau <nbd@openwrt.org>
+Signed-off-by: Felix Fietkau <nbd@nbd.name>
 Signed-off-by: Michael Lee <igvtee@gmail.com>
 Cc: devicetree@vger.kernel.org
 ---
diff --git a/target/linux/ramips/patches-4.4/0501-net-next-mediatek-add-the-drivers-core-files.patch b/target/linux/ramips/patches-4.4/0501-net-next-mediatek-add-the-drivers-core-files.patch
index a2f97665d58..cc4c2a152df 100644
--- a/target/linux/ramips/patches-4.4/0501-net-next-mediatek-add-the-drivers-core-files.patch
+++ b/target/linux/ramips/patches-4.4/0501-net-next-mediatek-add-the-drivers-core-files.patch
@@ -27,7 +27,7 @@ we are on. The code to bring up the switches and external ports has also been
 split into separate files.
 
 Signed-off-by: John Crispin <blogic@openwrt.org>
-Signed-off-by: Felix Fietkau <nbd@openwrt.org>
+Signed-off-by: Felix Fietkau <nbd@nbd.name>
 Signed-off-by: Michael Lee <igvtee@gmail.com>
 ---
  drivers/net/ethernet/mediatek/ethtool.c     |  235 ++++
@@ -57,7 +57,7 @@ Signed-off-by: Michael Lee <igvtee@gmail.com>
 + *   GNU General Public License for more details.
 + *
 + *   Copyright (C) 2009-2015 John Crispin <blogic@openwrt.org>
-+ *   Copyright (C) 2009-2015 Felix Fietkau <nbd@openwrt.org>
++ *   Copyright (C) 2009-2015 Felix Fietkau <nbd@nbd.name>
 + *   Copyright (C) 2013-2015 Michael Lee <igvtee@gmail.com>
 + */
 +
@@ -295,7 +295,7 @@ Signed-off-by: Michael Lee <igvtee@gmail.com>
 + *   GNU General Public License for more details.
 + *
 + *   Copyright (C) 2009-2015 John Crispin <blogic@openwrt.org>
-+ *   Copyright (C) 2009-2015 Felix Fietkau <nbd@openwrt.org>
++ *   Copyright (C) 2009-2015 Felix Fietkau <nbd@nbd.name>
 + *   Copyright (C) 2013-2015 Michael Lee <igvtee@gmail.com>
 + */
 +
@@ -315,7 +315,7 @@ Signed-off-by: Michael Lee <igvtee@gmail.com>
 + *   the Free Software Foundation; version 2 of the License
 + *
 + *   Copyright (C) 2009-2015 John Crispin <blogic@openwrt.org>
-+ *   Copyright (C) 2009-2015 Felix Fietkau <nbd@openwrt.org>
++ *   Copyright (C) 2009-2015 Felix Fietkau <nbd@nbd.name>
 + *   Copyright (C) 2013-2015 Michael Lee <igvtee@gmail.com>
 + */
 +
@@ -581,7 +581,7 @@ Signed-off-by: Michael Lee <igvtee@gmail.com>
 + *   GNU General Public License for more details.
 + *
 + *   Copyright (C) 2009-2015 John Crispin <blogic@openwrt.org>
-+ *   Copyright (C) 2009-2015 Felix Fietkau <nbd@openwrt.org>
++ *   Copyright (C) 2009-2015 Felix Fietkau <nbd@nbd.name>
 + *   Copyright (C) 2013-2015 Michael Lee <igvtee@gmail.com>
 + */
 +
@@ -611,7 +611,7 @@ Signed-off-by: Michael Lee <igvtee@gmail.com>
 + *   GNU General Public License for more details.
 + *
 + *   Copyright (C) 2009-2015 John Crispin <blogic@openwrt.org>
-+ *   Copyright (C) 2009-2015 Felix Fietkau <nbd@openwrt.org>
++ *   Copyright (C) 2009-2015 Felix Fietkau <nbd@nbd.name>
 + *   Copyright (C) 2013-2015 Michael Lee <igvtee@gmail.com>
 + */
 +
@@ -2201,7 +2201,7 @@ Signed-off-by: Michael Lee <igvtee@gmail.com>
 + *   GNU General Public License for more details.
 + *
 + *   Copyright (C) 2009-2015 John Crispin <blogic@openwrt.org>
-+ *   Copyright (C) 2009-2015 Felix Fietkau <nbd@openwrt.org>
++ *   Copyright (C) 2009-2015 Felix Fietkau <nbd@nbd.name>
 + *   Copyright (C) 2013-2015 Michael Lee <igvtee@gmail.com>
 + */
 +
diff --git a/target/linux/ramips/patches-4.4/0502-net-next-mediatek-add-switch-driver-for-rt3050.patch b/target/linux/ramips/patches-4.4/0502-net-next-mediatek-add-switch-driver-for-rt3050.patch
index 675888f9803..d13bda7a084 100644
--- a/target/linux/ramips/patches-4.4/0502-net-next-mediatek-add-switch-driver-for-rt3050.patch
+++ b/target/linux/ramips/patches-4.4/0502-net-next-mediatek-add-switch-driver-for-rt3050.patch
@@ -27,7 +27,7 @@ Signed-off-by: John Crispin <blogic@openwrt.org>
 + *   GNU General Public License for more details.
 + *
 + *   Copyright (C) 2009-2015 John Crispin <blogic@openwrt.org>
-+ *   Copyright (C) 2009-2015 Felix Fietkau <nbd@openwrt.org>
++ *   Copyright (C) 2009-2015 Felix Fietkau <nbd@nbd.name>
 + *   Copyright (C) 2013-2015 Michael Lee <igvtee@gmail.com>
 + */
 +
@@ -670,7 +670,7 @@ Signed-off-by: John Crispin <blogic@openwrt.org>
 + *   GNU General Public License for more details.
 + *
 + *   Copyright (C) 2009-2015 John Crispin <blogic@openwrt.org>
-+ *   Copyright (C) 2009-2015 Felix Fietkau <nbd@openwrt.org>
++ *   Copyright (C) 2009-2015 Felix Fietkau <nbd@nbd.name>
 + *   Copyright (C) 2013-2015 Michael Lee <igvtee@gmail.com>
 + */
 +
diff --git a/target/linux/ramips/patches-4.4/0503-net-next-mediatek-add-switch-driver-for-mt7620.patch b/target/linux/ramips/patches-4.4/0503-net-next-mediatek-add-switch-driver-for-mt7620.patch
index f3905ede44f..88882d7fa4c 100644
--- a/target/linux/ramips/patches-4.4/0503-net-next-mediatek-add-switch-driver-for-mt7620.patch
+++ b/target/linux/ramips/patches-4.4/0503-net-next-mediatek-add-switch-driver-for-mt7620.patch
@@ -27,7 +27,7 @@ Signed-off-by: John Crispin <blogic@openwrt.org>
 + *   GNU General Public License for more details.
 + *
 + *   Copyright (C) 2009-2015 John Crispin <blogic@openwrt.org>
-+ *   Copyright (C) 2009-2015 Felix Fietkau <nbd@openwrt.org>
++ *   Copyright (C) 2009-2015 Felix Fietkau <nbd@nbd.name>
 + *   Copyright (C) 2013-2015 Michael Lee <igvtee@gmail.com>
 + */
 +
@@ -285,7 +285,7 @@ Signed-off-by: John Crispin <blogic@openwrt.org>
 + *   GNU General Public License for more details.
 + *
 + *   Copyright (C) 2009-2015 John Crispin <blogic@openwrt.org>
-+ *   Copyright (C) 2009-2015 Felix Fietkau <nbd@openwrt.org>
++ *   Copyright (C) 2009-2015 Felix Fietkau <nbd@nbd.name>
 + *   Copyright (C) 2013-2015 Michael Lee <igvtee@gmail.com>
 + */
 +
diff --git a/target/linux/ramips/patches-4.4/0504-net-next-mediatek-add-switch-driver-for-mt7621.patch b/target/linux/ramips/patches-4.4/0504-net-next-mediatek-add-switch-driver-for-mt7621.patch
index 08d93f73ea1..071f23a7c03 100644
--- a/target/linux/ramips/patches-4.4/0504-net-next-mediatek-add-switch-driver-for-mt7621.patch
+++ b/target/linux/ramips/patches-4.4/0504-net-next-mediatek-add-switch-driver-for-mt7621.patch
@@ -25,7 +25,7 @@ Signed-off-by: John Crispin <blogic@openwrt.org>
 + *   GNU General Public License for more details.
 + *
 + *   Copyright (C) 2009-2015 John Crispin <blogic@openwrt.org>
-+ *   Copyright (C) 2009-2015 Felix Fietkau <nbd@openwrt.org>
++ *   Copyright (C) 2009-2015 Felix Fietkau <nbd@nbd.name>
 + *   Copyright (C) 2013-2015 Michael Lee <igvtee@gmail.com>
 + */
 +
diff --git a/target/linux/ramips/patches-4.4/0505-net-next-mediatek-add-support-for-rt2880.patch b/target/linux/ramips/patches-4.4/0505-net-next-mediatek-add-support-for-rt2880.patch
index 8ed00e38a6d..6221a164d80 100644
--- a/target/linux/ramips/patches-4.4/0505-net-next-mediatek-add-support-for-rt2880.patch
+++ b/target/linux/ramips/patches-4.4/0505-net-next-mediatek-add-support-for-rt2880.patch
@@ -8,7 +8,7 @@ normally be attached to an external phy of switch. The patch also adds the
 code required to drive the mdio bus.
 
 Signed-off-by: John Crispin <blogic@openwrt.org>
-Signed-off-by: Felix Fietkau <nbd@openwrt.org>
+Signed-off-by: Felix Fietkau <nbd@nbd.name>
 Signed-off-by: Michael Lee <igvtee@gmail.com>
 ---
  drivers/net/ethernet/mediatek/mdio_rt2880.c |  222 +++++++++++++++++++++++++++
@@ -32,7 +32,7 @@ Signed-off-by: Michael Lee <igvtee@gmail.com>
 + *   GNU General Public License for more details.
 + *
 + *   Copyright (C) 2009-2015 John Crispin <blogic@openwrt.org>
-+ *   Copyright (C) 2009-2015 Felix Fietkau <nbd@openwrt.org>
++ *   Copyright (C) 2009-2015 Felix Fietkau <nbd@nbd.name>
 + *   Copyright (C) 2013-2015 Michael Lee <igvtee@gmail.com>
 + */
 +
@@ -257,7 +257,7 @@ Signed-off-by: Michael Lee <igvtee@gmail.com>
 + *   GNU General Public License for more details.
 + *
 + *   Copyright (C) 2009-2015 John Crispin <blogic@openwrt.org>
-+ *   Copyright (C) 2009-2015 Felix Fietkau <nbd@openwrt.org>
++ *   Copyright (C) 2009-2015 Felix Fietkau <nbd@nbd.name>
 + *   Copyright (C) 2013-2015 Michael Lee <igvtee@gmail.com>
 + */
 +
@@ -283,7 +283,7 @@ Signed-off-by: Michael Lee <igvtee@gmail.com>
 + *   GNU General Public License for more details.
 + *
 + *   Copyright (C) 2009-2015 John Crispin <blogic@openwrt.org>
-+ *   Copyright (C) 2009-2015 Felix Fietkau <nbd@openwrt.org>
++ *   Copyright (C) 2009-2015 Felix Fietkau <nbd@nbd.name>
 + *   Copyright (C) 2013-2015 Michael Lee <igvtee@gmail.com>
 + */
 +
diff --git a/target/linux/ramips/patches-4.4/0506-net-next-mediatek-add-support-for-rt3050.patch b/target/linux/ramips/patches-4.4/0506-net-next-mediatek-add-support-for-rt3050.patch
index a80c940ec6d..e30ac0d4764 100644
--- a/target/linux/ramips/patches-4.4/0506-net-next-mediatek-add-support-for-rt3050.patch
+++ b/target/linux/ramips/patches-4.4/0506-net-next-mediatek-add-support-for-rt3050.patch
@@ -11,7 +11,7 @@ come straight from the SDK driver and we do not know the meaning of most of
 them.
 
 Signed-off-by: John Crispin <blogic@openwrt.org>
-Signed-off-by: Felix Fietkau <nbd@openwrt.org>
+Signed-off-by: Felix Fietkau <nbd@nbd.name>
 Signed-off-by: Michael Lee <igvtee@gmail.com>
 ---
  drivers/net/ethernet/mediatek/esw_rt3050.c |   18 +---
@@ -89,7 +89,7 @@ Signed-off-by: Michael Lee <igvtee@gmail.com>
 + *   GNU General Public License for more details.
 + *
 + *   Copyright (C) 2009-2015 John Crispin <blogic@openwrt.org>
-+ *   Copyright (C) 2009-2015 Felix Fietkau <nbd@openwrt.org>
++ *   Copyright (C) 2009-2015 Felix Fietkau <nbd@nbd.name>
 + *   Copyright (C) 2013-2015 Michael Lee <igvtee@gmail.com>
 + */
 +
diff --git a/target/linux/ramips/patches-4.4/0507-net-next-mediatek-add-support-for-rt3883.patch b/target/linux/ramips/patches-4.4/0507-net-next-mediatek-add-support-for-rt3883.patch
index 53d35d0728c..17d7b2fa099 100644
--- a/target/linux/ramips/patches-4.4/0507-net-next-mediatek-add-support-for-rt3883.patch
+++ b/target/linux/ramips/patches-4.4/0507-net-next-mediatek-add-support-for-rt3883.patch
@@ -7,7 +7,7 @@ Add support for rt3883 and its smaller version rt3662. They both have a single
 gBit port that will normally be attached to an external phy of switch.
 
 Signed-off-by: John Crispin <blogic@openwrt.org>
-Signed-off-by: Felix Fietkau <nbd@openwrt.org>
+Signed-off-by: Felix Fietkau <nbd@nbd.name>
 Signed-off-by: Michael Lee <igvtee@gmail.com>
 ---
  drivers/net/ethernet/mediatek/soc_rt3883.c |   75 ++++++++++++++++++++++++++++
@@ -27,7 +27,7 @@ Signed-off-by: Michael Lee <igvtee@gmail.com>
 + *   GNU General Public License for more details.
 + *
 + *   Copyright (C) 2009-2015 John Crispin <blogic@openwrt.org>
-+ *   Copyright (C) 2009-2015 Felix Fietkau <nbd@openwrt.org>
++ *   Copyright (C) 2009-2015 Felix Fietkau <nbd@nbd.name>
 + *   Copyright (C) 2013-2015 Michael Lee <igvtee@gmail.com>
 + */
 +
diff --git a/target/linux/ramips/patches-4.4/0508-net-next-mediatek-add-support-for-mt7620.patch b/target/linux/ramips/patches-4.4/0508-net-next-mediatek-add-support-for-mt7620.patch
index 4055026cb5a..04f986cd24e 100644
--- a/target/linux/ramips/patches-4.4/0508-net-next-mediatek-add-support-for-mt7620.patch
+++ b/target/linux/ramips/patches-4.4/0508-net-next-mediatek-add-support-for-mt7620.patch
@@ -12,7 +12,7 @@ that get written to the switch and the internal phys. These values come
 straight from the SDK driver.
 
 Signed-off-by: John Crispin <blogic@openwrt.org>
-Signed-off-by: Felix Fietkau <nbd@openwrt.org>
+Signed-off-by: Felix Fietkau <nbd@nbd.name>
 Signed-off-by: Michael Lee <igvtee@gmail.com>
 ---
  drivers/net/ethernet/mediatek/mdio_mt7620.c |  156 +++++++++++++
@@ -34,7 +34,7 @@ Signed-off-by: Michael Lee <igvtee@gmail.com>
 + *   GNU General Public License for more details.
 + *
 + *   Copyright (C) 2009-2015 John Crispin <blogic@openwrt.org>
-+ *   Copyright (C) 2009-2015 Felix Fietkau <nbd@openwrt.org>
++ *   Copyright (C) 2009-2015 Felix Fietkau <nbd@nbd.name>
 + *   Copyright (C) 2013-2015 Michael Lee <igvtee@gmail.com>
 + */
 +
@@ -193,7 +193,7 @@ Signed-off-by: Michael Lee <igvtee@gmail.com>
 + *   GNU General Public License for more details.
 + *
 + *   Copyright (C) 2009-2015 John Crispin <blogic@openwrt.org>
-+ *   Copyright (C) 2009-2015 Felix Fietkau <nbd@openwrt.org>
++ *   Copyright (C) 2009-2015 Felix Fietkau <nbd@nbd.name>
 + *   Copyright (C) 2013-2015 Michael Lee <igvtee@gmail.com>
 + */
 +
diff --git a/target/linux/ramips/patches-4.4/0509-net-next-mediatek-add-support-for-mt7621.patch b/target/linux/ramips/patches-4.4/0509-net-next-mediatek-add-support-for-mt7621.patch
index 4db202a9715..6920545f0cc 100644
--- a/target/linux/ramips/patches-4.4/0509-net-next-mediatek-add-support-for-mt7621.patch
+++ b/target/linux/ramips/patches-4.4/0509-net-next-mediatek-add-support-for-mt7621.patch
@@ -12,7 +12,7 @@ that get written to the switch and the internal phys. These values come
 straight from the SDK driver.
 
 Signed-off-by: John Crispin <blogic@openwrt.org>
-Signed-off-by: Felix Fietkau <nbd@openwrt.org>
+Signed-off-by: Felix Fietkau <nbd@nbd.name>
 Signed-off-by: Michael Lee <igvtee@gmail.com>
 ---
  drivers/net/ethernet/mediatek/soc_mt7621.c |  186 ++++++++++++++++++++++++++++
@@ -32,7 +32,7 @@ Signed-off-by: Michael Lee <igvtee@gmail.com>
 + *   GNU General Public License for more details.
 + *
 + *   Copyright (C) 2009-2015 John Crispin <blogic@openwrt.org>
-+ *   Copyright (C) 2009-2015 Felix Fietkau <nbd@openwrt.org>
++ *   Copyright (C) 2009-2015 Felix Fietkau <nbd@nbd.name>
 + *   Copyright (C) 2013-2015 Michael Lee <igvtee@gmail.com>
 + */
 +
diff --git a/target/linux/ramips/patches-4.4/0510-net-next-mediatek-add-Kconfig-and-Makefile.patch b/target/linux/ramips/patches-4.4/0510-net-next-mediatek-add-Kconfig-and-Makefile.patch
index 51427adcc51..4519eb67d57 100644
--- a/target/linux/ramips/patches-4.4/0510-net-next-mediatek-add-Kconfig-and-Makefile.patch
+++ b/target/linux/ramips/patches-4.4/0510-net-next-mediatek-add-Kconfig-and-Makefile.patch
@@ -6,7 +6,7 @@ Subject: [PATCH 510/513] net-next: mediatek: add Kconfig and Makefile
 This patch adds the Makefile and Kconfig required to make the driver build.
 
 Signed-off-by: John Crispin <blogic@openwrt.org>
-Signed-off-by: Felix Fietkau <nbd@openwrt.org>
+Signed-off-by: Felix Fietkau <nbd@nbd.name>
 Signed-off-by: Michael Lee <igvtee@gmail.com>
 ---
  drivers/net/ethernet/Kconfig           |    1 +
diff --git a/target/linux/ramips/patches-4.4/0518-net-mediatek-get-rt3050-ethernet-ports-to-be-disable.patch b/target/linux/ramips/patches-4.4/0518-net-mediatek-get-rt3050-ethernet-ports-to-be-disable.patch
index f5defe1fbd8..54448bd5050 100644
--- a/target/linux/ramips/patches-4.4/0518-net-mediatek-get-rt3050-ethernet-ports-to-be-disable.patch
+++ b/target/linux/ramips/patches-4.4/0518-net-mediatek-get-rt3050-ethernet-ports-to-be-disable.patch
@@ -18,7 +18,7 @@ Signed-off-by: Vittorio Gambaletta <openwrt@vittgam.net>
 +++ b/drivers/net/ethernet/mediatek/esw_rt3050.c
 @@ -10,6 +10,7 @@
   *   Copyright (C) 2009-2015 John Crispin <blogic@openwrt.org>
-  *   Copyright (C) 2009-2015 Felix Fietkau <nbd@openwrt.org>
+  *   Copyright (C) 2009-2015 Felix Fietkau <nbd@nbd.name>
   *   Copyright (C) 2013-2015 Michael Lee <igvtee@gmail.com>
 + *   Copyright (C) 2016 Vittorio Gambaletta <openwrt@vittgam.net>
   */
diff --git a/target/linux/rb532/src/patch-cmdline.c b/target/linux/rb532/src/patch-cmdline.c
index 571f848d81c..d3a5b119e44 100644
--- a/target/linux/rb532/src/patch-cmdline.c
+++ b/target/linux/rb532/src/patch-cmdline.c
@@ -1,7 +1,7 @@
 /*
  * patch-cmdline.c - patch the kernel command line on rb532
  *
- * Copyright (C) 2006 Felix Fietkau <nbd@openwrt.org>
+ * Copyright (C) 2006 Felix Fietkau <nbd@nbd.name>
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
diff --git a/target/linux/x86/Makefile b/target/linux/x86/Makefile
index 7bead63d7b9..2c42ecc2bec 100644
--- a/target/linux/x86/Makefile
+++ b/target/linux/x86/Makefile
@@ -11,7 +11,7 @@ BOARD:=x86
 BOARDNAME:=x86
 FEATURES:=squashfs ext4 vdi vmdk pcmcia targz
 SUBTARGETS=generic legacy xen_domu geode 64
-MAINTAINER:=Felix Fietkau <nbd@openwrt.org>
+MAINTAINER:=Felix Fietkau <nbd@nbd.name>
 
 DEFAULT_PACKAGES += partx-utils
 
diff --git a/toolchain/gcc/common.mk b/toolchain/gcc/common.mk
index c3546f545b1..eab143cbc62 100644
--- a/toolchain/gcc/common.mk
+++ b/toolchain/gcc/common.mk
@@ -1,7 +1,7 @@
 #
 # Copyright (C) 2002-2003 Erik Andersen <andersen@uclibc.org>
 # Copyright (C) 2004 Manuel Novoa III <mjn3@uclibc.org>
-# Copyright (C) 2005-2006 Felix Fietkau <nbd@openwrt.org>
+# Copyright (C) 2005-2006 Felix Fietkau <nbd@nbd.name>
 # Copyright (C) 2006-2014 OpenWrt.org
 #
 # This program is free software; you can redistribute it and/or modify
diff --git a/toolchain/musl/patches/001-update-to-git-2016-03-06.patch b/toolchain/musl/patches/001-update-to-git-2016-03-06.patch
index fb8a66bafde..d74d8162741 100644
--- a/toolchain/musl/patches/001-update-to-git-2016-03-06.patch
+++ b/toolchain/musl/patches/001-update-to-git-2016-03-06.patch
@@ -9,7 +9,7 @@ Date:   Sun Mar 6 17:11:29 2016 -0500
     broken builds don't happen.
 
 commit 5a92dd95c77cee81755f1a441ae0b71e3ae2bcdb
-Author: Felix Fietkau <nbd@openwrt.org>
+Author: Felix Fietkau <nbd@nbd.name>
 Date:   Mon Jan 25 13:20:52 2016 +0100
 
     add powerpc soft-float support
diff --git a/tools/firmware-utils/src/nand_ecc.c b/tools/firmware-utils/src/nand_ecc.c
index b1e9305158c..58fb6ce0db4 100644
--- a/tools/firmware-utils/src/nand_ecc.c
+++ b/tools/firmware-utils/src/nand_ecc.c
@@ -2,7 +2,7 @@
  * calculate ecc code for nand flash
  *
  * Copyright (C) 2008 yajin <yajin@vm-kernel.org>
- * Copyright (C) 2009 Felix Fietkau <nbd@openwrt.org>
+ * Copyright (C) 2009 Felix Fietkau <nbd@nbd.name>
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as
diff --git a/tools/firmware-utils/src/ptgen.c b/tools/firmware-utils/src/ptgen.c
index 2b7ec25e489..04f4ec86298 100644
--- a/tools/firmware-utils/src/ptgen.c
+++ b/tools/firmware-utils/src/ptgen.c
@@ -1,6 +1,6 @@
 /* 
  * ptgen - partition table generator
- * Copyright (C) 2006 by Felix Fietkau <nbd@openwrt.org>
+ * Copyright (C) 2006 by Felix Fietkau <nbd@nbd.name>
  *
  * uses parts of afdisk
  * Copyright (C) 2002 by David Roetzel <david@roetzel.de>
diff --git a/tools/patch-image/src/patch-cmdline.c b/tools/patch-image/src/patch-cmdline.c
index 571f848d81c..d3a5b119e44 100644
--- a/tools/patch-image/src/patch-cmdline.c
+++ b/tools/patch-image/src/patch-cmdline.c
@@ -1,7 +1,7 @@
 /*
  * patch-cmdline.c - patch the kernel command line on rb532
  *
- * Copyright (C) 2006 Felix Fietkau <nbd@openwrt.org>
+ * Copyright (C) 2006 Felix Fietkau <nbd@nbd.name>
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
diff --git a/tools/patch-image/src/patch-dtb.c b/tools/patch-image/src/patch-dtb.c
index 161e1dca2d3..7812eb9b39d 100644
--- a/tools/patch-image/src/patch-dtb.c
+++ b/tools/patch-image/src/patch-dtb.c
@@ -1,7 +1,7 @@
 /*
  * patch-dtb.c - patch a dtb into an image
  *
- * Copyright (C) 2006 Felix Fietkau <nbd@openwrt.org>
+ * Copyright (C) 2006 Felix Fietkau <nbd@nbd.name>
  * Copyright (C) 2012 John Crispin <blogic@openwrt.org>
  *
  * This program is free software; you can redistribute it and/or
-- 
GitLab