diff --git a/package/network/ipv6/6relayd/Makefile b/package/network/ipv6/6relayd/Makefile
new file mode 100644
index 0000000000000000000000000000000000000000..59f6979ce7039f4a997ba5a416840da7a13a0728
--- /dev/null
+++ b/package/network/ipv6/6relayd/Makefile
@@ -0,0 +1,48 @@
+#
+# Copyright (C) 2012 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=6relayd
+PKG_VERSION:=2012-10-29
+PKG_RELEASE=$(PKG_SOURCE_VERSION)
+
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
+PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
+PKG_SOURCE_URL:=git://nbd.name/6relayd.git
+PKG_SOURCE_PROTO:=git
+PKG_SOURCE_VERSION:=1e86a847a9aa2c31e6871b657c4d241a4650e290
+
+PKG_MAINTAINER:=Steven Barth <steven@midlink.org>
+
+include $(INCLUDE_DIR)/package.mk
+include $(INCLUDE_DIR)/cmake.mk
+
+define Package/6relayd
+  SECTION:=ipv6
+  CATEGORY:=IPv6
+  TITLE:=IPv6-Relay (RD-, DHCPv6- & NDP-Proxy)
+  DEPENDS:=+kmod-ipv6
+endef
+
+define Package/6relayd/description
+ 6relayd is an IPv6-tool that relays IPv6-management protocols like router
+ discovery, neighbor discovery and DHCPv6 so that clients on routed (non-
+ bridged) interfaces can use the public address prefix, DHCPv6 and DNS-service
+ of a master interface. This is useful to avoid NAT in chained IPv6-routers.
+endef
+
+define Package/6relayd/install
+	$(INSTALL_DIR) $(1)/usr/sbin/
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/6relayd $(1)/usr/sbin/
+	$(INSTALL_DIR) $(1)/etc/hotplug.d/iface
+	$(INSTALL_DATA) ./files/6relayd.hotplug $(1)/etc/hotplug.d/iface/30-6relay
+	$(INSTALL_DIR) $(1)/etc/init.d
+	$(INSTALL_BIN) ./files/6relayd.init $(1)/etc/init.d/6relayd
+endef
+
+$(eval $(call BuildPackage,6relayd))
diff --git a/package/network/ipv6/6relayd/files/6relayd.hotplug b/package/network/ipv6/6relayd/files/6relayd.hotplug
new file mode 100644
index 0000000000000000000000000000000000000000..e29a34a09eccdc787be228edc65c4bff08896a48
--- /dev/null
+++ b/package/network/ipv6/6relayd/files/6relayd.hotplug
@@ -0,0 +1,2 @@
+#!/bin/sh
+/etc/init.d/6relayd enabled && /etc/init.d/6relayd start
diff --git a/package/network/ipv6/6relayd/files/6relayd.init b/package/network/ipv6/6relayd/files/6relayd.init
new file mode 100644
index 0000000000000000000000000000000000000000..4bf507841004c3b2acc13151a622726066e5e7d5
--- /dev/null
+++ b/package/network/ipv6/6relayd/files/6relayd.init
@@ -0,0 +1,90 @@
+#!/bin/sh /etc/rc.common
+# Copyright (c) 2011-2012 OpenWrt.org
+START=80
+
+resolve_ifname() {
+	grep -qs "^ *$1:" /proc/net/dev && {
+		append ifaces "$1"
+	}
+}
+
+resolve_network() {
+	local ifn
+	fixup_interface "$1"
+	config_get ifn "$1" ifname
+	[ -z "$ifn" ] && return 1
+	resolve_ifname "$ifn"
+}
+
+start_6relayd() {
+	local cfg="$1"
+
+	local args="-S"
+	local ifaces=""
+
+	config_get proto "$cfg" proto
+	[[ "$proto" == 6relay ]] || return 0
+
+	SERVICE_DAEMONIZE=1
+	SERVICE_WRITE_PID=1
+	SERVICE_PID_FILE="/var/run/6relayd-$cfg.pid"
+	[ -f "$SERVICE_PID_FILE" ] && {
+		if grep -q 6relayd "/proc/$(cat $SERVICE_PID_FILE)/cmdline"; then
+			return 0
+		else
+			rm -f "$SERVICE_PID_FILE"
+		fi
+	}
+
+	local net networks
+	config_get networks "$cfg" network
+	for net in $networks; do
+		resolve_network "$net" || {
+			return 1
+		}
+	done
+
+	local ifn ifnames
+	config_get ifnames "$cfg" ifname
+	for ifn in $ifnames; do
+		resolve_ifname "$ifn"
+	done
+
+	local forward_rd # = 1
+	config_get_bool forward_rd "$cfg" forward_rd 1
+	[ $forward_rd -eq 1 ] && append args "-R"
+
+	local forward_dhcpv6 # = 1
+	local forward_dhcpv6_mode # = relay
+	config_get_bool forward_dhcpv6 "$cfg" forward_dhcpv6 1
+	config_get forward_dhcpv6_mode "$cfg" forward_dhcpv6_mode
+	[ $forward_dhcpv6 -eq 1 ] && append args "-D$forward_dhcpv6_mode"
+
+	local forward_ndp # = 1
+	config_get_bool forward_ndp "$cfg" forward_ndp 1
+	[ $forward_ndp -eq 1 ] && append args "-N"
+
+	local configure_routes # = 1
+	config_get_bool configure_routes "$cfg" configure_routes 1
+	[ $configure_routes -eq 1 ] && append args "-r"
+
+	local always_rewrite_dns # = 0
+	config_get_bool always_rewrite_dns "$cfg" always_rewrite_dns 0
+	[ $always_rewrite_dns -eq 1 ] && append args "-n"
+
+	service_start /usr/sbin/6relayd $args $ifaces
+}
+
+stop() {
+	for pid in /var/run/6relayd-*.pid; do
+		SERVICE_PID_FILE="$pid"
+		service_stop /usr/sbin/6relayd
+		rm -f "$SERVICE_PID_FILE"
+	done
+}
+
+start() {
+	include /lib/network
+	config_load network
+	config_foreach start_6relayd interface
+}