diff --git a/include/target.mk b/include/target.mk
index 4bb91fe3a7..c8c0c53d77 100644
--- a/include/target.mk
+++ b/include/target.mk
@@ -41,7 +41,8 @@ DEFAULT_PACKAGES.router:=\
 	firewall4 \
 	nftables \
 	kmod-nft-offload \
-	ipv6helper \
+	odhcp6c \
+	odhcpd-ipv6only \
 	ppp \
 	ppp-mod-pppoe
 # For easy usage
diff --git a/package/emortal/ipv6-helper/Makefile b/package/emortal/ipv6-helper/Makefile
deleted file mode 100644
index 4a1eaf118f..0000000000
--- a/package/emortal/ipv6-helper/Makefile
+++ /dev/null
@@ -1,31 +0,0 @@
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=ipv6helper
-PKG_RELEASE:=5
-
-PKG_MAINTAINER:=Lean
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/ipv6helper
-  SECTION:=ipv6
-  TITLE:=IPv6 Helper and Dynamic Update he.net of ip
-  DEPENDS:=+odhcpd-ipv6only +odhcp6c +6in4
-  PKGARCH:=all
-endef
-
-define Package/ipv6helper/description
-  IPv6 Helper and Dynamic Update he.net of ip
-endef
-
-define Build/Compile
-endef
-
-define Package/ipv6helper/install
-	$(INSTALL_DIR) $(1)/etc/hotplug.d/iface
-	$(INSTALL_BIN) ./files/60-6in4 $(1)/etc/hotplug.d/iface/
-	$(INSTALL_DIR) $(1)/etc/uci-defaults
-	$(INSTALL_BIN) ./files/60-ipv6-lifetime $(1)/etc/uci-defaults/
-endef
-
-$(eval $(call BuildPackage,ipv6helper))
diff --git a/package/emortal/ipv6-helper/files/60-6in4 b/package/emortal/ipv6-helper/files/60-6in4
deleted file mode 100755
index f297eb4846..0000000000
--- a/package/emortal/ipv6-helper/files/60-6in4
+++ /dev/null
@@ -1,15 +0,0 @@
-#!/bin/sh
-. /lib/functions.sh
-
-if [ "$ACTION" != "ifup" ]; then
-    exit
-fi
-
-config_load network
-config_get tunnelid "$INTERFACE" tunnelid
-config_get username "$INTERFACE" username
-config_get password "$INTERFACE" password
-
-if [ "$tunnelid" != "" ]; then
-    wget -O - "https://$username:$password@ipv4.tunnelbroker.net/nic/update?hostname=$tunnelid"
-fi
diff --git a/package/emortal/ipv6-helper/files/60-ipv6-lifetime b/package/emortal/ipv6-helper/files/60-ipv6-lifetime
deleted file mode 100755
index 249453609c..0000000000
--- a/package/emortal/ipv6-helper/files/60-ipv6-lifetime
+++ /dev/null
@@ -1,18 +0,0 @@
-#!/bin/sh
-
-uci -q get system.@imm_init[0] > "/dev/null" || uci -q add system imm_init > "/dev/null"
-[ "$(uci -q get system.@imm_init[0].ipv6)" = "2" ] && exit 0
-
-uci -q batch <<-EOF
-	delete dhcp.lan.dhcpv6
-	delete dhcp.lan.ra_flags
-	add_list dhcp.lan.ra_flags="other-config"
-	set dhcp.lan.max_preferred_lifetime="2700"
-	set dhcp.lan.max_valid_lifetime="5400"
-	commit dhcp
-
-	set system.@imm_init[0].ipv6="2"
-	commit system
-EOF
-
-exit 0