diff --git a/ipv6/miredo/Makefile b/ipv6/miredo/Makefile
index cd4b0b41c..7c26ed525 100644
--- a/ipv6/miredo/Makefile
+++ b/ipv6/miredo/Makefile
@@ -18,6 +18,7 @@ PKG_MD5SUM:=1281e7e75bddbde244cd778d99fa22d4
 PKG_FIXUP:=autoreconf
 PKG_INSTALL:=1
 
+include $(INCLUDE_DIR)/uclibc++.mk
 include $(INCLUDE_DIR)/package.mk
 
 define Package/miredo/Default
@@ -30,7 +31,7 @@ endef
 define Package/miredo-common
 $(call Package/miredo/Default)
   TITLE:=Teredo (IPv6 tunneling over UDP through NAT) shared libraries
-  DEPENDS+= +ip +libpthread +librt +uclibcxx +kmod-ipv6 +kmod-tun
+  DEPENDS+= +ip +libpthread +librt $(CXX_DEPENDS) +kmod-ipv6 +kmod-tun
 endef
 
 define Package/miredo-server
@@ -61,18 +62,16 @@ CONFIGURE_ARGS += \
 	--disable-chroot \
 	--enable-teredo-client \
 	--enable-miredo-user=root \
-	--without-Judy \
+	--without-Judy
+
+EXTRA_CXXFLAGS=-fno-rtti
 
 CONFIGURE_VARS += \
-	CPPFLAGS="$$$$CPPFLAGS -I$(STAGING_DIR)/usr/include/uClibc++" \
-	CXXFLAGS="$$$$CXXFLAGS -fno-builtin -fno-rtti -nostdinc++"  \
-	LIBS="-nodefaultlibs -lc -luClibc++ -lm" \
+	LIBS="-lm" \
 	ac_cv_file__proc_self_maps=yes \
-	ac_cv_header_sys_capability_h=no \
+	ac_cv_header_sys_capability_h=no
 
-# XXX: override (:=), don't append (+=)
-MAKE_FLAGS := \
-	CXXLINK="\$$$$(LINK)" \
+MAKE_FLAGS := CXXLINK="$(TARGET_CXX)"
 
 define Package/miredo-common/install
 	$(INSTALL_DIR) $(1)/usr/lib