diff --git a/package/6in4/Makefile b/package/6in4/Makefile
index 5722a486382..1f0573b97ad 100644
--- a/package/6in4/Makefile
+++ b/package/6in4/Makefile
@@ -18,6 +18,7 @@ define Package/6in4
   CATEGORY:=IPv6
   DEPENDS:=+ip +kmod-ipv6 +kmod-sit
   TITLE:=IPv6-in-IPv4 configuration support
+  MAINTAINER:=Jo-Philipp Wich <xm@subsignal.org>
   PKGARCH:=all
 endef
 
diff --git a/package/firewall/Makefile b/package/firewall/Makefile
index 82ae04757f6..1f461567b34 100644
--- a/package/firewall/Makefile
+++ b/package/firewall/Makefile
@@ -18,6 +18,7 @@ define Package/firewall
   CATEGORY:=Base system
   URL:=http://openwrt.org/
   TITLE:=OpenWrt firewall
+  MAINTAINER:=Jo-Philipp Wich <xm@subsignal.org>
   DEPENDS:=+iptables +iptables-mod-conntrack +iptables-mod-nat
   PKGARCH:=all
 endef
diff --git a/package/nvram/Makefile b/package/nvram/Makefile
index 5ff3791c5ee..81cff034c4c 100644
--- a/package/nvram/Makefile
+++ b/package/nvram/Makefile
@@ -18,6 +18,7 @@ define Package/nvram
   SECTION:=utils
   CATEGORY:=Base system
   TITLE:=Userspace port of the Broadcom NVRAM manipulation tool
+  MAINTAINER:=Jo-Philipp Wich <xm@subsignal.org>
   DEPENDS:=@TARGET_brcm47xx||@TARGET_ar71xx
 endef
 
diff --git a/package/opkg/Makefile b/package/opkg/Makefile
index be5c490e0aa..73dc3032fc8 100644
--- a/package/opkg/Makefile
+++ b/package/opkg/Makefile
@@ -26,6 +26,7 @@ define Package/opkg
   SECTION:=base
   CATEGORY:=Base system
   TITLE:=opkg package management system
+  MAINTAINER:=Jo-Philipp Wich <xm@subsignal.org>
   URL:=http://wiki.openmoko.org/wiki/Opkg
 endef
 
diff --git a/package/ppp/Makefile b/package/ppp/Makefile
index f24ddb6d9cf..4107ef68645 100644
--- a/package/ppp/Makefile
+++ b/package/ppp/Makefile
@@ -25,6 +25,7 @@ include $(INCLUDE_DIR)/package.mk
 define Package/ppp/Default
   SECTION:=net
   CATEGORY:=Network
+  MAINTAINER:=Jo-Philipp Wich <xm@subsignal.org>
   URL:=http://ppp.samba.org/
 endef
 
diff --git a/package/pptp/Makefile b/package/pptp/Makefile
index a55309bf51a..a7b9220d955 100644
--- a/package/pptp/Makefile
+++ b/package/pptp/Makefile
@@ -21,6 +21,7 @@ define Package/pptp
   SECTION:=net
   CATEGORY:=Network
   TITLE:=PPTP client
+  MAINTAINER:=Jo-Philipp Wich <xm@subsignal.org>
   URL:=http://pptpclient.sourceforge.net/
   DEPENDS:=+ppp +kmod-gre
 endef
diff --git a/package/px5g/Makefile b/package/px5g/Makefile
index 638f8c0c4eb..ad4ec405808 100644
--- a/package/px5g/Makefile
+++ b/package/px5g/Makefile
@@ -18,6 +18,7 @@ define Package/px5g
   SECTION:=utils
   CATEGORY:=Utilities
   TITLE:=Standalone X.509 certificate generator
+  MAINTAINER:=Jo-Philipp Wich <xm@subsignal.org>
 endef
 
 define Package/px5g/description
diff --git a/package/uhttpd/Makefile b/package/uhttpd/Makefile
index e37fa90ec4d..835e5b52772 100644
--- a/package/uhttpd/Makefile
+++ b/package/uhttpd/Makefile
@@ -19,6 +19,7 @@ define Package/uhttpd/default
   SECTION:=net
   CATEGORY:=Network
   TITLE:=uHTTPd - tiny, single threaded HTTP server
+  MAINTAINER:=Jo-Philipp Wich <xm@subsignal.org>
 endef
 
 define Package/uhttpd