diff --git a/net/miredo/Makefile b/ipv6/miredo/Makefile
similarity index 98%
rename from net/miredo/Makefile
rename to ipv6/miredo/Makefile
index 04d6528f2..c7f6bcf88 100644
--- a/net/miredo/Makefile
+++ b/ipv6/miredo/Makefile
@@ -18,8 +18,8 @@ PKG_MD5SUM:=bf49c1ddc068746760787d0cf76e40de
 include $(INCLUDE_DIR)/package.mk
 
 define Package/miredo/Default
-  SECTION:=net
-  CATEGORY:=Network
+  SECTION:=ipv6
+  CATEGORY:=IPv6
   DEPENDS:=+libpthread +uclibcxx +kmod-ipv6 +kmod-tun
   SUBMENU:=miredo: Teredo (IPv6 tunneling over UDP through NAT)
   URL:=http://www.simphalempin.com/dev/miredo/
diff --git a/net/miredo/files/miredo-server.init b/ipv6/miredo/files/miredo-server.init
similarity index 100%
rename from net/miredo/files/miredo-server.init
rename to ipv6/miredo/files/miredo-server.init
diff --git a/net/miredo/files/miredo.init b/ipv6/miredo/files/miredo.init
similarity index 100%
rename from net/miredo/files/miredo.init
rename to ipv6/miredo/files/miredo.init
diff --git a/net/miredo/patches/100-uclibc.patch b/ipv6/miredo/patches/100-uclibc.patch
similarity index 100%
rename from net/miredo/patches/100-uclibc.patch
rename to ipv6/miredo/patches/100-uclibc.patch
diff --git a/ipv6/mrd6/Makefile b/ipv6/mrd6/Makefile
index 0bd3f4403..1d372d7b8 100644
--- a/ipv6/mrd6/Makefile
+++ b/ipv6/mrd6/Makefile
@@ -8,14 +8,14 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=mrd6
-PKG_VERSION:=0.9.5
-PKG_REVISION:=3
-PKG_RELEASE:=$(PKG_REVISION).1
+PKG_VERSION:=0.9.6
+PKG_RELEASE:=1
 
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_REVISION).tar.gz
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=http://fivebits.net/files/mrd6/ \
 	http://hng.av.it.pt/mrd6/download/
-PKG_MD5SUM:=361322198dafcc5ffab5e8e23197012b
+PKG_MD5SUM:=00221326810358889e811c48cbac415a
+TAR_OPTIONS:=
 
 include $(INCLUDE_DIR)/package.mk