diff --git a/package/ltq-dsl-app/Makefile b/package/ltq-dsl-app/Makefile
index 32608236d..8985484fd 100644
--- a/package/ltq-dsl-app/Makefile
+++ b/package/ltq-dsl-app/Makefile
@@ -15,6 +15,7 @@ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_BUILD_DIR:=$(BUILD_DIR)/dsl_cpe_control-$(PKG_VERSION)
 PKG_SOURCE_URL:=http://mirror2.openwrt.org/sources/
 PKG_MD5SUM:=ee315306626b68794d3d3636dabfe161
+PKG_MAINTAINER:=John Crispin <blogic@openwrt.org>
 
 PKG_CONFIG_DEPENDS:=\
 	CONFIG_LTQ_DSL_ENABLE_SOAP \
@@ -31,7 +32,6 @@ define Package/ltq-dsl-app
   TITLE:=Lantiq DSL userland tool
   URL:=http://www.lantiq.com/
   DEPENDS:=@TARGET_lantiq&&!(TARGET_lantiq_falcon||TARGET_lantiq_falcon_stable) +libpthread
-  MAINTAINER:=John Crispin <blogic@openwrt.org> 
   MENU:=1
 endef
 
diff --git a/package/ltq-dsl/Makefile b/package/ltq-dsl/Makefile
index 0e2a9328a..1fb003a90 100644
--- a/package/ltq-dsl/Makefile
+++ b/package/ltq-dsl/Makefile
@@ -16,6 +16,7 @@ PKG_SOURCE:=$(PKG_BASE_NAME)-$(PKG_VERSION).tar.gz
 PKG_BUILD_DIR:=$(KERNEL_BUILD_DIR)/drv_dsl_cpe_api-$(PKG_VERSION)
 PKG_SOURCE_URL:=http://mirror2.openwrt.org/sources/
 PKG_MD5SUM:=c45bc531c1ed2ac80f68fb986b63bb87
+PKG_MAINTAINER:=John Crispin <blogic@openwrt.org>
 
 FW_NAME:=ltq-dsl-fw-0.1
 FW_MD5:=4700a36b66b955b4c5544227267356f4
@@ -41,7 +42,6 @@ define KernelPackage/ltq-dsl-template
 	$(PKG_BUILD_DIR)/src/drv_dsl_cpe_api.ko \
 	$(PKG_BUILD_DIR)/src/mei/lantiq_atm.ko
   AUTOLOAD:=$(call AutoLoad,50,lantiq_mei drv_dsl_cpe_api lantiq_atm)
-  MAINTAINER:=John Crispin <blogic@openwrt.org>
 endef
 
 KernelPackage/ltq-dsl-danube=$(call KernelPackage/ltq-dsl-template,danube)
@@ -57,7 +57,6 @@ define Package/kmod-ltq-dsl-firmware-template
   VARIANT:= $(1)-$(2)
   URL:=http://www.lantiq.com/
   DEPENDS:=@TARGET_lantiq_$(2) kmod-ltq-dsl-$(2)
-  MAINTAINER:=John Crispin <blogic@openwrt.org>
 endef
 
 Package/kmod-ltq-dsl-firmware-a-danube=$(call Package/kmod-ltq-dsl-firmware-template,a,danube)
diff --git a/package/ltq-ifxos/Makefile b/package/ltq-ifxos/Makefile
index a43a10be3..eeca2010a 100644
--- a/package/ltq-ifxos/Makefile
+++ b/package/ltq-ifxos/Makefile
@@ -14,6 +14,7 @@ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_RELEASE:=3
 PKG_SOURCE_URL:=http://mirror2.openwrt.org/sources
 PKG_MD5SUM:=bc107f9d8ff6bed4c2760a2817bbb029
+PKG_MAINTAINER:=John Crispin <blogic@openwrt.org>
 
 include $(INCLUDE_DIR)/package.mk
 
@@ -21,7 +22,6 @@ define KernelPackage/ltq-ifxos
   SUBMENU:=Voice over IP
   TITLE:=Lantiq OS abstraction library
   URL:=http://www.lantiq.com/
-  MAINTAINER:=Lantiq
   DEPENDS:=@TARGET_lantiq
   FILES:=$(PKG_BUILD_DIR)/src/drv_ifxos.ko
   AUTOLOAD:=$(call AutoLoad,10,drv_ifxos)
diff --git a/package/ltq-tapi/Makefile b/package/ltq-tapi/Makefile
index 79b77b75d..2582235dc 100644
--- a/package/ltq-tapi/Makefile
+++ b/package/ltq-tapi/Makefile
@@ -15,6 +15,7 @@ PKG_RELEASE:=3
 PKG_SOURCE:=drv_tapi-$(PKG_VERSION).tar.bz2
 PKG_SOURCE_URL:=http://mirror2.openwrt.org/sources
 PKG_MD5SUM:=edb43b494832c540cc035493d18db58f
+PKG_MAINTAINER:=John Crispin <blogic@openwrt.org>
 
 include $(INCLUDE_DIR)/ltqtapi.mk
 include $(INCLUDE_DIR)/package.mk
@@ -26,7 +27,6 @@ define KernelPackage/ltq-tapi
   DEPENDS:=$(LTQ_TAPI_TARGET) +kmod-ltq-ifxos
   FILES:=$(PKG_BUILD_DIR)/src/drv_tapi.ko
   AUTOLOAD:=$(call AutoLoad,20,drv_tapi)
-  MAINTAINER:=John Crispin <blogic@openwrt.org>
 endef
 
 define KernelPackage/ltq-tapi/description
diff --git a/package/ltq-vmmc/Makefile b/package/ltq-vmmc/Makefile
index 98b5df0ec..98355b1ec 100644
--- a/package/ltq-vmmc/Makefile
+++ b/package/ltq-vmmc/Makefile
@@ -15,6 +15,7 @@ PKG_RELEASE:=2
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
 PKG_MD5SUM:=d8eee8cba0edb28974cc1f8532e3bd18
 PKG_SOURCE_URL:=http://mirror2.openwrt.org/sources
+PKG_MAINTAINER:=John Crispin <blogic@openwrt.org>
 
 include $(INCLUDE_DIR)/ltqtapi.mk
 include $(INCLUDE_DIR)/package.mk
@@ -26,7 +27,6 @@ define KernelPackage/ltq-vmmc
   DEPENDS:=$(LTQ_TAPI_TARGET) +kmod-ltq-tapi
   FILES:=$(PKG_BUILD_DIR)/src/drv_vmmc.ko
   AUTOLOAD:=$(call AutoLoad,25,drv_vmmc)
-  MAINTAINER:=John Crispin <blogic@openwrt.org>
 endef
 
 define KernelPackage/ltq-vmmc/description