diff --git a/openwrt/package/Config.in b/openwrt/package/Config.in
index 705d7bc9e15..5f42885ce86 100644
--- a/openwrt/package/Config.in
+++ b/openwrt/package/Config.in
@@ -40,6 +40,7 @@ source "package/kismet/Config.in"
 source "package/l2tpd/Config.in"
 source "package/lighttpd/Config.in"
 source "package/maradns/Config.in"
+source "package/ndisc/Config.in"
 source "package/net-snmp/Config.in"
 source "package/nfs-server/Config.in"
 source "package/nmap/Config.in"
diff --git a/openwrt/package/Makefile b/openwrt/package/Makefile
index d595cd756b1..451fdd078d6 100644
--- a/openwrt/package/Makefile
+++ b/openwrt/package/Makefile
@@ -52,6 +52,7 @@ package-$(BR2_PACKAGE_MICROPERL) += microperl
 package-$(BR2_PACKAGE_MONIT) += monit
 package-$(BR2_PACKAGE_MYSQL) += mysql
 package-$(BR2_PACKAGE_NCURSES) += ncurses
+package-$(BR2_PACKAGE_NDISC) += ndisc
 package-$(BR2_PACKAGE_NET_SNMP) += net-snmp
 package-$(BR2_PACKAGE_NFS_SERVER) += nfs-server
 package-$(BR2_PACKAGE_NMAP) += nmap
diff --git a/openwrt/package/ndisc/Config.in b/openwrt/package/ndisc/Config.in
new file mode 100644
index 00000000000..8759c32554f
--- /dev/null
+++ b/openwrt/package/ndisc/Config.in
@@ -0,0 +1,32 @@
+menu "ndisc - ICMPv6 discovery tools"
+
+config BR2_PACKAGE_NDISC
+	bool
+	default n
+	depends BR2_PACKAGE_NDISC6 || BR2_PACKAGE_RDISC6
+
+config BR2_PACKAGE_NDISC6
+	tristate "ndisc6 - ICMPv6 neighbour discovery tool"
+#	default m if CONFIG_DEVEL
+	default n
+	select BR2_PACKAGE_NDISC
+	help
+	  
+	  ICMPv6 neighbour discovery tools
+	  
+	  http://people.via.ecp.fr/~rem/ndisc/
+	  
+
+config BR2_PACKAGE_RDISC6
+	tristate "rdisc6 - ICMPv6 router discovery tool"
+#	default m if CONFIG_DEVEL
+	default n
+	select BR2_PACKAGE_NDISC
+	help
+	  
+	  ICMPv6 router discovery tool
+	  
+	  http://people.via.ecp.fr/~rem/ndisc/
+	  
+
+endmenu
diff --git a/openwrt/package/ndisc/Makefile b/openwrt/package/ndisc/Makefile
new file mode 100644
index 00000000000..81d5c115abc
--- /dev/null
+++ b/openwrt/package/ndisc/Makefile
@@ -0,0 +1,41 @@
+# $Id$
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=ndisc
+PKG_VERSION:=0.1.3
+PKG_RELEASE:=1
+PKG_MD5SUM:= c7a8acd8e3d1053265faa17f7edb75d6
+
+PKG_SOURCE_URL:=http://people.via.ecp.fr/~rem/ndisc/v0.1/
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
+PKG_CAT:=bzcat
+
+PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
+
+include $(TOPDIR)/package/rules.mk
+
+$(eval $(call PKG_template,NDISC6,ndisc6,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
+$(eval $(call PKG_template,RDISC6,rdisc6,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
+
+$(PKG_BUILD_DIR)/.configured:
+	touch $@
+
+$(PKG_BUILD_DIR)/.built:
+	$(MAKE) -C $(PKG_BUILD_DIR) \
+		$(TARGET_CONFIGURE_OPTS) \
+		CFLAGS="$(TARGET_CFLAGS)" \
+		all
+	touch $@
+
+$(IPKG_NDISC6):
+	install -d -m0755 $(IDIR_NDISC6)/usr/bin
+	install -m0755 $(PKG_BUILD_DIR)/ndisc6 $(IDIR_NDISC6)/usr/bin/
+	$(RSTRIP) $(IDIR_NDISC6)
+	$(IPKG_BUILD) $(IDIR_NDISC6) $(PACKAGE_DIR)
+
+$(IPKG_RDISC6):
+	install -d -m0755 $(IDIR_RDISC6)/usr/bin
+	install -m0755 $(PKG_BUILD_DIR)/rdisc6 $(IDIR_RDISC6)/usr/bin/
+	$(RSTRIP) $(IDIR_RDISC6)
+	$(IPKG_BUILD) $(IDIR_RDISC6) $(PACKAGE_DIR)
diff --git a/openwrt/package/ndisc/ipkg/ndisc6.control b/openwrt/package/ndisc/ipkg/ndisc6.control
new file mode 100644
index 00000000000..91356525e47
--- /dev/null
+++ b/openwrt/package/ndisc/ipkg/ndisc6.control
@@ -0,0 +1,8 @@
+Package: ndisc6
+Priority: optional
+Section: net
+Version: [TBDL]
+Architecture: [TBDL]
+Maintainer: Nico <nthill@free.fr>
+Source: http://openwrt.org/cgi-bin/viewcvs.cgi/openwrt/package/ndisc/
+Description: ICMPv6 Neighbour Discovery tool
diff --git a/openwrt/package/ndisc/ipkg/rdisc6.control b/openwrt/package/ndisc/ipkg/rdisc6.control
new file mode 100644
index 00000000000..05df1176bb3
--- /dev/null
+++ b/openwrt/package/ndisc/ipkg/rdisc6.control
@@ -0,0 +1,8 @@
+Package: rdisc6
+Priority: optional
+Section: net
+Version: [TBDL]
+Architecture: [TBDL]
+Maintainer: Nico <nthill@free.fr>
+Source: http://openwrt.org/cgi-bin/viewcvs.cgi/openwrt/package/ndisc/
+Description: ICMPv6 Router Discovery tool