diff --git a/bsp/wr1043nd/.config b/bsp/wr1043nd/.config
index c262e5951a0f48d6e9dfaafcaba1e15fce4e45df..39d1ec193c9820d220c02898b7bcaacb9a2f0332 100644
--- a/bsp/wr1043nd/.config
+++ b/bsp/wr1043nd/.config
@@ -471,10 +471,10 @@ CONFIG_BUSYBOX_CONFIG_MV=y
 # CONFIG_BUSYBOX_CONFIG_NANDDUMP is not set
 # CONFIG_BUSYBOX_CONFIG_NANDWRITE is not set
 # CONFIG_BUSYBOX_CONFIG_NBDCLIENT is not set
-CONFIG_BUSYBOX_CONFIG_NC=y
-CONFIG_BUSYBOX_CONFIG_NC_SERVER=y
-CONFIG_BUSYBOX_CONFIG_NC_EXTRA=y
 CONFIG_BUSYBOX_CONFIG_NC_110_COMPAT=y
+CONFIG_BUSYBOX_CONFIG_NC_EXTRA=y
+CONFIG_BUSYBOX_CONFIG_NC_SERVER=y
+CONFIG_BUSYBOX_CONFIG_NC=y
 CONFIG_BUSYBOX_CONFIG_NETMSG=y
 CONFIG_BUSYBOX_CONFIG_NETSTAT=y
 CONFIG_BUSYBOX_CONFIG_NICE=y
@@ -967,9 +967,9 @@ CONFIG_PACKAGE_kmod-ipv6=y
 # CONFIG_PACKAGE_kmod-iwl4965 is not set
 # CONFIG_PACKAGE_kmod-iwlagn is not set
 # CONFIG_PACKAGE_kmod-iwl-legacy is not set
-# CONFIG_PACKAGE_kmod-l2tp-eth is not set
-# CONFIG_PACKAGE_kmod-l2tp-ip is not set
-# CONFIG_PACKAGE_kmod-l2tp is not set
+CONFIG_PACKAGE_kmod-l2tp-eth=y
+CONFIG_PACKAGE_kmod-l2tp-ip=y
+CONFIG_PACKAGE_kmod-l2tp=y
 CONFIG_PACKAGE_kmod-leds-gpio=y
 # CONFIG_PACKAGE_kmod-leds-rb750 is not set
 # CONFIG_PACKAGE_kmod-leds-wndr3700-usb is not set
@@ -1159,7 +1159,7 @@ CONFIG_PACKAGE_libip6tc=y
 # CONFIG_PACKAGE_libiw is not set
 CONFIG_PACKAGE_libjson=y
 # CONFIG_PACKAGE_libltdl is not set
-# CONFIG_PACKAGE_liblua is not set
+CONFIG_PACKAGE_liblua=y
 # CONFIG_PACKAGE_libmount is not set
 # CONFIG_PACKAGE_libncursesw is not set
 CONFIG_PACKAGE_libncurses=y
@@ -1169,13 +1169,14 @@ CONFIG_PACKAGE_libnl-tiny=y
 # CONFIG_PACKAGE_libpcap is not set
 CONFIG_PACKAGE_libpthread=y
 # CONFIG_PACKAGE_libreadline is not set
+CONFIG_PACKAGE_libremap-agent=y
 # CONFIG_PACKAGE_librpc is not set
 CONFIG_PACKAGE_librt=y
 # CONFIG_PACKAGE_libstdcpp is not set
 CONFIG_PACKAGE_libubox=y
 # CONFIG_PACKAGE_libubus-lua is not set
 CONFIG_PACKAGE_libubus=y
-# CONFIG_PACKAGE_libuci-lua is not set
+CONFIG_PACKAGE_libuci-lua=y
 CONFIG_PACKAGE_libuci=y
 # CONFIG_PACKAGE_libuecc is not set
 CONFIG_PACKAGE_libugpio=y
@@ -1189,6 +1190,13 @@ CONFIG_PACKAGE_libxtables=y
 # CONFIG_PACKAGE_lsblk is not set
 # CONFIG_PACKAGE_luac is not set
 # CONFIG_PACKAGE_lua is not set
+# CONFIG_PACKAGE_luci-lib-libremap-altermap is not set
+CONFIG_PACKAGE_luci-lib-libremap-contact=y
+CONFIG_PACKAGE_luci-lib-libremap-freifunk=y
+CONFIG_PACKAGE_luci-lib-libremap-location=y
+# CONFIG_PACKAGE_luci-lib-libremap-olsr is not set
+CONFIG_PACKAGE_luci-lib-libremap-system=y
+CONFIG_PACKAGE_luci-lib-libremap=y
 CONFIG_PACKAGE_MAC80211_DEBUGFS=y
 CONFIG_PACKAGE_MAC80211_MESH=y
 # CONFIG_PACKAGE_maccalc is not set
@@ -1229,6 +1237,7 @@ CONFIG_PACKAGE_swconfig=y
 CONFIG_PACKAGE_tc=y
 CONFIG_PACKAGE_terminfo=y
 # CONFIG_PACKAGE_tune2fs is not set
+CONFIG_PACKAGE_tunneldigger=y
 # CONFIG_PACKAGE_uboot-ar71xx-nbg460n_550n_550nh is not set
 CONFIG_PACKAGE_uboot-envtools=y
 CONFIG_PACKAGE_ubusd=y
diff --git a/bsp/wr740n/.config b/bsp/wr740n/.config
index f5d0dcbf8e018142426b47a23e945b7396cc2903..a7c8f85e439e428f947f7199398b036a7738b779 100644
--- a/bsp/wr740n/.config
+++ b/bsp/wr740n/.config
@@ -471,10 +471,10 @@ CONFIG_BUSYBOX_CONFIG_MV=y
 # CONFIG_BUSYBOX_CONFIG_NANDDUMP is not set
 # CONFIG_BUSYBOX_CONFIG_NANDWRITE is not set
 # CONFIG_BUSYBOX_CONFIG_NBDCLIENT is not set
-CONFIG_BUSYBOX_CONFIG_NC=y
-CONFIG_BUSYBOX_CONFIG_NC_SERVER=y
-CONFIG_BUSYBOX_CONFIG_NC_EXTRA=y
 CONFIG_BUSYBOX_CONFIG_NC_110_COMPAT=y
+CONFIG_BUSYBOX_CONFIG_NC_EXTRA=y
+CONFIG_BUSYBOX_CONFIG_NC_SERVER=y
+CONFIG_BUSYBOX_CONFIG_NC=y
 CONFIG_BUSYBOX_CONFIG_NETMSG=y
 CONFIG_BUSYBOX_CONFIG_NETSTAT=y
 CONFIG_BUSYBOX_CONFIG_NICE=y
@@ -964,9 +964,9 @@ CONFIG_PACKAGE_kmod-ipv6=y
 # CONFIG_PACKAGE_kmod-iwl4965 is not set
 # CONFIG_PACKAGE_kmod-iwlagn is not set
 # CONFIG_PACKAGE_kmod-iwl-legacy is not set
-# CONFIG_PACKAGE_kmod-l2tp-eth is not set
-# CONFIG_PACKAGE_kmod-l2tp-ip is not set
-# CONFIG_PACKAGE_kmod-l2tp is not set
+CONFIG_PACKAGE_kmod-l2tp-eth=y
+CONFIG_PACKAGE_kmod-l2tp-ip=y
+CONFIG_PACKAGE_kmod-l2tp=y
 CONFIG_PACKAGE_kmod-leds-gpio=y
 # CONFIG_PACKAGE_kmod-leds-rb750 is not set
 # CONFIG_PACKAGE_kmod-leds-wndr3700-usb is not set
@@ -1156,7 +1156,7 @@ CONFIG_PACKAGE_libip6tc=y
 # CONFIG_PACKAGE_libiw is not set
 CONFIG_PACKAGE_libjson=y
 # CONFIG_PACKAGE_libltdl is not set
-# CONFIG_PACKAGE_liblua is not set
+CONFIG_PACKAGE_liblua=y
 # CONFIG_PACKAGE_libmount is not set
 # CONFIG_PACKAGE_libncursesw is not set
 CONFIG_PACKAGE_libncurses=y
@@ -1166,13 +1166,14 @@ CONFIG_PACKAGE_libnl-tiny=y
 # CONFIG_PACKAGE_libpcap is not set
 CONFIG_PACKAGE_libpthread=y
 # CONFIG_PACKAGE_libreadline is not set
+CONFIG_PACKAGE_libremap-agent=y
 # CONFIG_PACKAGE_librpc is not set
 CONFIG_PACKAGE_librt=y
 # CONFIG_PACKAGE_libstdcpp is not set
 CONFIG_PACKAGE_libubox=y
 # CONFIG_PACKAGE_libubus-lua is not set
 CONFIG_PACKAGE_libubus=y
-# CONFIG_PACKAGE_libuci-lua is not set
+CONFIG_PACKAGE_libuci-lua=y
 CONFIG_PACKAGE_libuci=y
 # CONFIG_PACKAGE_libuecc is not set
 CONFIG_PACKAGE_libugpio=y
@@ -1186,6 +1187,13 @@ CONFIG_PACKAGE_libxtables=y
 # CONFIG_PACKAGE_lsblk is not set
 # CONFIG_PACKAGE_luac is not set
 # CONFIG_PACKAGE_lua is not set
+# CONFIG_PACKAGE_luci-lib-libremap-altermap is not set
+CONFIG_PACKAGE_luci-lib-libremap-contact=y
+CONFIG_PACKAGE_luci-lib-libremap-freifunk=y
+CONFIG_PACKAGE_luci-lib-libremap-location=y
+# CONFIG_PACKAGE_luci-lib-libremap-olsr is not set
+CONFIG_PACKAGE_luci-lib-libremap-system=y
+CONFIG_PACKAGE_luci-lib-libremap=y
 CONFIG_PACKAGE_MAC80211_DEBUGFS=y
 CONFIG_PACKAGE_MAC80211_MESH=y
 # CONFIG_PACKAGE_maccalc is not set
@@ -1226,6 +1234,7 @@ CONFIG_PACKAGE_swconfig=y
 CONFIG_PACKAGE_tc=y
 CONFIG_PACKAGE_terminfo=y
 # CONFIG_PACKAGE_tune2fs is not set
+CONFIG_PACKAGE_tunneldigger=y
 CONFIG_PACKAGE_uboot-ar71xx-nbg460n_550n_550nh=y
 CONFIG_PACKAGE_uboot-envtools=y
 CONFIG_PACKAGE_ubusd=y
diff --git a/bsp/wr741nd2/.config b/bsp/wr741nd2/.config
index 87075c99215c06cce1db07dd3a8f1238d5247065..15bff90f5bc840aef0ae2b6d2158bbb8758220ee 100644
--- a/bsp/wr741nd2/.config
+++ b/bsp/wr741nd2/.config
@@ -471,10 +471,10 @@ CONFIG_BUSYBOX_CONFIG_MV=y
 # CONFIG_BUSYBOX_CONFIG_NANDDUMP is not set
 # CONFIG_BUSYBOX_CONFIG_NANDWRITE is not set
 # CONFIG_BUSYBOX_CONFIG_NBDCLIENT is not set
-CONFIG_BUSYBOX_CONFIG_NC=y
-CONFIG_BUSYBOX_CONFIG_NC_SERVER=y
-CONFIG_BUSYBOX_CONFIG_NC_EXTRA=y
 CONFIG_BUSYBOX_CONFIG_NC_110_COMPAT=y
+CONFIG_BUSYBOX_CONFIG_NC_EXTRA=y
+CONFIG_BUSYBOX_CONFIG_NC_SERVER=y
+CONFIG_BUSYBOX_CONFIG_NC=y
 CONFIG_BUSYBOX_CONFIG_NETMSG=y
 CONFIG_BUSYBOX_CONFIG_NETSTAT=y
 CONFIG_BUSYBOX_CONFIG_NICE=y
@@ -964,9 +964,9 @@ CONFIG_PACKAGE_kmod-ipv6=y
 # CONFIG_PACKAGE_kmod-iwl4965 is not set
 # CONFIG_PACKAGE_kmod-iwlagn is not set
 # CONFIG_PACKAGE_kmod-iwl-legacy is not set
-# CONFIG_PACKAGE_kmod-l2tp-eth is not set
-# CONFIG_PACKAGE_kmod-l2tp-ip is not set
-# CONFIG_PACKAGE_kmod-l2tp is not set
+CONFIG_PACKAGE_kmod-l2tp-eth=y
+CONFIG_PACKAGE_kmod-l2tp-ip=y
+CONFIG_PACKAGE_kmod-l2tp=y
 CONFIG_PACKAGE_kmod-leds-gpio=y
 # CONFIG_PACKAGE_kmod-leds-rb750 is not set
 # CONFIG_PACKAGE_kmod-leds-wndr3700-usb is not set
@@ -1156,7 +1156,7 @@ CONFIG_PACKAGE_libip6tc=y
 # CONFIG_PACKAGE_libiw is not set
 CONFIG_PACKAGE_libjson=y
 # CONFIG_PACKAGE_libltdl is not set
-# CONFIG_PACKAGE_liblua is not set
+CONFIG_PACKAGE_liblua=y
 # CONFIG_PACKAGE_libmount is not set
 # CONFIG_PACKAGE_libncursesw is not set
 CONFIG_PACKAGE_libncurses=y
@@ -1166,13 +1166,14 @@ CONFIG_PACKAGE_libnl-tiny=y
 # CONFIG_PACKAGE_libpcap is not set
 CONFIG_PACKAGE_libpthread=y
 # CONFIG_PACKAGE_libreadline is not set
+CONFIG_PACKAGE_libremap-agent=y
 # CONFIG_PACKAGE_librpc is not set
 CONFIG_PACKAGE_librt=y
 # CONFIG_PACKAGE_libstdcpp is not set
 CONFIG_PACKAGE_libubox=y
 # CONFIG_PACKAGE_libubus-lua is not set
 CONFIG_PACKAGE_libubus=y
-# CONFIG_PACKAGE_libuci-lua is not set
+CONFIG_PACKAGE_libuci-lua=y
 CONFIG_PACKAGE_libuci=y
 # CONFIG_PACKAGE_libuecc is not set
 CONFIG_PACKAGE_libugpio=y
@@ -1186,6 +1187,13 @@ CONFIG_PACKAGE_libxtables=y
 # CONFIG_PACKAGE_lsblk is not set
 # CONFIG_PACKAGE_luac is not set
 # CONFIG_PACKAGE_lua is not set
+# CONFIG_PACKAGE_luci-lib-libremap-altermap is not set
+CONFIG_PACKAGE_luci-lib-libremap-contact=y
+CONFIG_PACKAGE_luci-lib-libremap-freifunk=y
+CONFIG_PACKAGE_luci-lib-libremap-location=y
+# CONFIG_PACKAGE_luci-lib-libremap-olsr is not set
+CONFIG_PACKAGE_luci-lib-libremap-system=y
+CONFIG_PACKAGE_luci-lib-libremap=y
 CONFIG_PACKAGE_MAC80211_DEBUGFS=y
 CONFIG_PACKAGE_MAC80211_MESH=y
 # CONFIG_PACKAGE_maccalc is not set
@@ -1226,6 +1234,7 @@ CONFIG_PACKAGE_swconfig=y
 CONFIG_PACKAGE_tc=y
 CONFIG_PACKAGE_terminfo=y
 # CONFIG_PACKAGE_tune2fs is not set
+CONFIG_PACKAGE_tunneldigger=y
 CONFIG_PACKAGE_uboot-ar71xx-nbg460n_550n_550nh=y
 CONFIG_PACKAGE_uboot-envtools=y
 CONFIG_PACKAGE_ubusd=y
diff --git a/bsp/wr741nd4/.config b/bsp/wr741nd4/.config
index 87075c99215c06cce1db07dd3a8f1238d5247065..15bff90f5bc840aef0ae2b6d2158bbb8758220ee 100644
--- a/bsp/wr741nd4/.config
+++ b/bsp/wr741nd4/.config
@@ -471,10 +471,10 @@ CONFIG_BUSYBOX_CONFIG_MV=y
 # CONFIG_BUSYBOX_CONFIG_NANDDUMP is not set
 # CONFIG_BUSYBOX_CONFIG_NANDWRITE is not set
 # CONFIG_BUSYBOX_CONFIG_NBDCLIENT is not set
-CONFIG_BUSYBOX_CONFIG_NC=y
-CONFIG_BUSYBOX_CONFIG_NC_SERVER=y
-CONFIG_BUSYBOX_CONFIG_NC_EXTRA=y
 CONFIG_BUSYBOX_CONFIG_NC_110_COMPAT=y
+CONFIG_BUSYBOX_CONFIG_NC_EXTRA=y
+CONFIG_BUSYBOX_CONFIG_NC_SERVER=y
+CONFIG_BUSYBOX_CONFIG_NC=y
 CONFIG_BUSYBOX_CONFIG_NETMSG=y
 CONFIG_BUSYBOX_CONFIG_NETSTAT=y
 CONFIG_BUSYBOX_CONFIG_NICE=y
@@ -964,9 +964,9 @@ CONFIG_PACKAGE_kmod-ipv6=y
 # CONFIG_PACKAGE_kmod-iwl4965 is not set
 # CONFIG_PACKAGE_kmod-iwlagn is not set
 # CONFIG_PACKAGE_kmod-iwl-legacy is not set
-# CONFIG_PACKAGE_kmod-l2tp-eth is not set
-# CONFIG_PACKAGE_kmod-l2tp-ip is not set
-# CONFIG_PACKAGE_kmod-l2tp is not set
+CONFIG_PACKAGE_kmod-l2tp-eth=y
+CONFIG_PACKAGE_kmod-l2tp-ip=y
+CONFIG_PACKAGE_kmod-l2tp=y
 CONFIG_PACKAGE_kmod-leds-gpio=y
 # CONFIG_PACKAGE_kmod-leds-rb750 is not set
 # CONFIG_PACKAGE_kmod-leds-wndr3700-usb is not set
@@ -1156,7 +1156,7 @@ CONFIG_PACKAGE_libip6tc=y
 # CONFIG_PACKAGE_libiw is not set
 CONFIG_PACKAGE_libjson=y
 # CONFIG_PACKAGE_libltdl is not set
-# CONFIG_PACKAGE_liblua is not set
+CONFIG_PACKAGE_liblua=y
 # CONFIG_PACKAGE_libmount is not set
 # CONFIG_PACKAGE_libncursesw is not set
 CONFIG_PACKAGE_libncurses=y
@@ -1166,13 +1166,14 @@ CONFIG_PACKAGE_libnl-tiny=y
 # CONFIG_PACKAGE_libpcap is not set
 CONFIG_PACKAGE_libpthread=y
 # CONFIG_PACKAGE_libreadline is not set
+CONFIG_PACKAGE_libremap-agent=y
 # CONFIG_PACKAGE_librpc is not set
 CONFIG_PACKAGE_librt=y
 # CONFIG_PACKAGE_libstdcpp is not set
 CONFIG_PACKAGE_libubox=y
 # CONFIG_PACKAGE_libubus-lua is not set
 CONFIG_PACKAGE_libubus=y
-# CONFIG_PACKAGE_libuci-lua is not set
+CONFIG_PACKAGE_libuci-lua=y
 CONFIG_PACKAGE_libuci=y
 # CONFIG_PACKAGE_libuecc is not set
 CONFIG_PACKAGE_libugpio=y
@@ -1186,6 +1187,13 @@ CONFIG_PACKAGE_libxtables=y
 # CONFIG_PACKAGE_lsblk is not set
 # CONFIG_PACKAGE_luac is not set
 # CONFIG_PACKAGE_lua is not set
+# CONFIG_PACKAGE_luci-lib-libremap-altermap is not set
+CONFIG_PACKAGE_luci-lib-libremap-contact=y
+CONFIG_PACKAGE_luci-lib-libremap-freifunk=y
+CONFIG_PACKAGE_luci-lib-libremap-location=y
+# CONFIG_PACKAGE_luci-lib-libremap-olsr is not set
+CONFIG_PACKAGE_luci-lib-libremap-system=y
+CONFIG_PACKAGE_luci-lib-libremap=y
 CONFIG_PACKAGE_MAC80211_DEBUGFS=y
 CONFIG_PACKAGE_MAC80211_MESH=y
 # CONFIG_PACKAGE_maccalc is not set
@@ -1226,6 +1234,7 @@ CONFIG_PACKAGE_swconfig=y
 CONFIG_PACKAGE_tc=y
 CONFIG_PACKAGE_terminfo=y
 # CONFIG_PACKAGE_tune2fs is not set
+CONFIG_PACKAGE_tunneldigger=y
 CONFIG_PACKAGE_uboot-ar71xx-nbg460n_550n_550nh=y
 CONFIG_PACKAGE_uboot-envtools=y
 CONFIG_PACKAGE_ubusd=y
diff --git a/bsp/wr841n8/.config b/bsp/wr841n8/.config
index 9fc500c5d408883d2b43b3f60b8b42756ac58183..4a1b17267615a2275d76c9299d813c18196b3726 100644
--- a/bsp/wr841n8/.config
+++ b/bsp/wr841n8/.config
@@ -471,10 +471,10 @@ CONFIG_BUSYBOX_CONFIG_MV=y
 # CONFIG_BUSYBOX_CONFIG_NANDDUMP is not set
 # CONFIG_BUSYBOX_CONFIG_NANDWRITE is not set
 # CONFIG_BUSYBOX_CONFIG_NBDCLIENT is not set
-CONFIG_BUSYBOX_CONFIG_NC=y
-CONFIG_BUSYBOX_CONFIG_NC_SERVER=y
-CONFIG_BUSYBOX_CONFIG_NC_EXTRA=y
 CONFIG_BUSYBOX_CONFIG_NC_110_COMPAT=y
+CONFIG_BUSYBOX_CONFIG_NC_EXTRA=y
+CONFIG_BUSYBOX_CONFIG_NC_SERVER=y
+CONFIG_BUSYBOX_CONFIG_NC=y
 CONFIG_BUSYBOX_CONFIG_NETMSG=y
 CONFIG_BUSYBOX_CONFIG_NETSTAT=y
 CONFIG_BUSYBOX_CONFIG_NICE=y
@@ -964,9 +964,9 @@ CONFIG_PACKAGE_kmod-ipv6=y
 # CONFIG_PACKAGE_kmod-iwl4965 is not set
 # CONFIG_PACKAGE_kmod-iwlagn is not set
 # CONFIG_PACKAGE_kmod-iwl-legacy is not set
-# CONFIG_PACKAGE_kmod-l2tp-eth is not set
-# CONFIG_PACKAGE_kmod-l2tp-ip is not set
-# CONFIG_PACKAGE_kmod-l2tp is not set
+CONFIG_PACKAGE_kmod-l2tp-eth=y
+CONFIG_PACKAGE_kmod-l2tp-ip=y
+CONFIG_PACKAGE_kmod-l2tp=y
 CONFIG_PACKAGE_kmod-leds-gpio=y
 # CONFIG_PACKAGE_kmod-leds-rb750 is not set
 # CONFIG_PACKAGE_kmod-leds-wndr3700-usb is not set
@@ -1156,7 +1156,7 @@ CONFIG_PACKAGE_libip6tc=y
 # CONFIG_PACKAGE_libiw is not set
 CONFIG_PACKAGE_libjson=y
 # CONFIG_PACKAGE_libltdl is not set
-# CONFIG_PACKAGE_liblua is not set
+CONFIG_PACKAGE_liblua=y
 # CONFIG_PACKAGE_libmount is not set
 # CONFIG_PACKAGE_libncursesw is not set
 CONFIG_PACKAGE_libncurses=y
@@ -1166,13 +1166,14 @@ CONFIG_PACKAGE_libnl-tiny=y
 # CONFIG_PACKAGE_libpcap is not set
 CONFIG_PACKAGE_libpthread=y
 # CONFIG_PACKAGE_libreadline is not set
+CONFIG_PACKAGE_libremap-agent=y
 # CONFIG_PACKAGE_librpc is not set
 CONFIG_PACKAGE_librt=y
 # CONFIG_PACKAGE_libstdcpp is not set
 CONFIG_PACKAGE_libubox=y
 # CONFIG_PACKAGE_libubus-lua is not set
 CONFIG_PACKAGE_libubus=y
-# CONFIG_PACKAGE_libuci-lua is not set
+CONFIG_PACKAGE_libuci-lua=y
 CONFIG_PACKAGE_libuci=y
 # CONFIG_PACKAGE_libuecc is not set
 CONFIG_PACKAGE_libugpio=y
@@ -1186,6 +1187,13 @@ CONFIG_PACKAGE_libxtables=y
 # CONFIG_PACKAGE_lsblk is not set
 # CONFIG_PACKAGE_luac is not set
 # CONFIG_PACKAGE_lua is not set
+# CONFIG_PACKAGE_luci-lib-libremap-altermap is not set
+CONFIG_PACKAGE_luci-lib-libremap-contact=y
+CONFIG_PACKAGE_luci-lib-libremap-freifunk=y
+CONFIG_PACKAGE_luci-lib-libremap-location=y
+# CONFIG_PACKAGE_luci-lib-libremap-olsr is not set
+CONFIG_PACKAGE_luci-lib-libremap-system=y
+CONFIG_PACKAGE_luci-lib-libremap=y
 CONFIG_PACKAGE_MAC80211_DEBUGFS=y
 CONFIG_PACKAGE_MAC80211_MESH=y
 # CONFIG_PACKAGE_maccalc is not set
@@ -1226,6 +1234,7 @@ CONFIG_PACKAGE_swconfig=y
 CONFIG_PACKAGE_tc=y
 CONFIG_PACKAGE_terminfo=y
 # CONFIG_PACKAGE_tune2fs is not set
+CONFIG_PACKAGE_tunneldigger=y
 CONFIG_PACKAGE_uboot-ar71xx-nbg460n_550n_550nh=y
 CONFIG_PACKAGE_uboot-envtools=y
 CONFIG_PACKAGE_ubusd=y
diff --git a/bsp/wr841nd7/.config b/bsp/wr841nd7/.config
index 9fc500c5d408883d2b43b3f60b8b42756ac58183..10222b8bad6d4c9d9e8d0b12a8292467108391db 100644
--- a/bsp/wr841nd7/.config
+++ b/bsp/wr841nd7/.config
@@ -471,10 +471,10 @@ CONFIG_BUSYBOX_CONFIG_MV=y
 # CONFIG_BUSYBOX_CONFIG_NANDDUMP is not set
 # CONFIG_BUSYBOX_CONFIG_NANDWRITE is not set
 # CONFIG_BUSYBOX_CONFIG_NBDCLIENT is not set
-CONFIG_BUSYBOX_CONFIG_NC=y
-CONFIG_BUSYBOX_CONFIG_NC_SERVER=y
-CONFIG_BUSYBOX_CONFIG_NC_EXTRA=y
 CONFIG_BUSYBOX_CONFIG_NC_110_COMPAT=y
+CONFIG_BUSYBOX_CONFIG_NC_EXTRA=y
+CONFIG_BUSYBOX_CONFIG_NC_SERVER=y
+CONFIG_BUSYBOX_CONFIG_NC=y
 CONFIG_BUSYBOX_CONFIG_NETMSG=y
 CONFIG_BUSYBOX_CONFIG_NETSTAT=y
 CONFIG_BUSYBOX_CONFIG_NICE=y
@@ -964,9 +964,9 @@ CONFIG_PACKAGE_kmod-ipv6=y
 # CONFIG_PACKAGE_kmod-iwl4965 is not set
 # CONFIG_PACKAGE_kmod-iwlagn is not set
 # CONFIG_PACKAGE_kmod-iwl-legacy is not set
-# CONFIG_PACKAGE_kmod-l2tp-eth is not set
-# CONFIG_PACKAGE_kmod-l2tp-ip is not set
-# CONFIG_PACKAGE_kmod-l2tp is not set
+CONFIG_PACKAGE_kmod-l2tp-eth=y
+CONFIG_PACKAGE_kmod-l2tp-ip=y
+CONFIG_PACKAGE_kmod-l2tp=y
 CONFIG_PACKAGE_kmod-leds-gpio=y
 # CONFIG_PACKAGE_kmod-leds-rb750 is not set
 # CONFIG_PACKAGE_kmod-leds-wndr3700-usb is not set
@@ -1156,7 +1156,7 @@ CONFIG_PACKAGE_libip6tc=y
 # CONFIG_PACKAGE_libiw is not set
 CONFIG_PACKAGE_libjson=y
 # CONFIG_PACKAGE_libltdl is not set
-# CONFIG_PACKAGE_liblua is not set
+CONFIG_PACKAGE_liblua=y
 # CONFIG_PACKAGE_libmount is not set
 # CONFIG_PACKAGE_libncursesw is not set
 CONFIG_PACKAGE_libncurses=y
@@ -1166,13 +1166,14 @@ CONFIG_PACKAGE_libnl-tiny=y
 # CONFIG_PACKAGE_libpcap is not set
 CONFIG_PACKAGE_libpthread=y
 # CONFIG_PACKAGE_libreadline is not set
+CONFIG_PACKAGE_libremap-agent=y
 # CONFIG_PACKAGE_librpc is not set
 CONFIG_PACKAGE_librt=y
 # CONFIG_PACKAGE_libstdcpp is not set
 CONFIG_PACKAGE_libubox=y
 # CONFIG_PACKAGE_libubus-lua is not set
 CONFIG_PACKAGE_libubus=y
-# CONFIG_PACKAGE_libuci-lua is not set
+CONFIG_PACKAGE_libuci-lua=y
 CONFIG_PACKAGE_libuci=y
 # CONFIG_PACKAGE_libuecc is not set
 CONFIG_PACKAGE_libugpio=y
@@ -1184,8 +1185,15 @@ CONFIG_PACKAGE_libxtables=y
 # CONFIG_PACKAGE_look is not set
 # CONFIG_PACKAGE_losetup is not set
 # CONFIG_PACKAGE_lsblk is not set
-# CONFIG_PACKAGE_luac is not set
+CONFIG_PACKAGE_luac=y
 # CONFIG_PACKAGE_lua is not set
+# CONFIG_PACKAGE_luci-lib-libremap-altermap is not set
+CONFIG_PACKAGE_luci-lib-libremap-contact=y
+CONFIG_PACKAGE_luci-lib-libremap-freifunk=y
+CONFIG_PACKAGE_luci-lib-libremap-location=y
+# CONFIG_PACKAGE_luci-lib-libremap-olsr is not set
+CONFIG_PACKAGE_luci-lib-libremap-system=y
+CONFIG_PACKAGE_luci-lib-libremap=y
 CONFIG_PACKAGE_MAC80211_DEBUGFS=y
 CONFIG_PACKAGE_MAC80211_MESH=y
 # CONFIG_PACKAGE_maccalc is not set
@@ -1226,6 +1234,7 @@ CONFIG_PACKAGE_swconfig=y
 CONFIG_PACKAGE_tc=y
 CONFIG_PACKAGE_terminfo=y
 # CONFIG_PACKAGE_tune2fs is not set
+CONFIG_PACKAGE_tunneldigger=y
 CONFIG_PACKAGE_uboot-ar71xx-nbg460n_550n_550nh=y
 CONFIG_PACKAGE_uboot-envtools=y
 CONFIG_PACKAGE_ubusd=y
diff --git a/build_patches/feeds.conf b/build_patches/feeds.conf
index b5ff13d14f850d7294b24f6babd641f6318e0d2a..76b46cab1d97093178d20a9b7a3f865e5347548e 100644
--- a/build_patches/feeds.conf
+++ b/build_patches/feeds.conf
@@ -1,4 +1,6 @@
 src-link openwrt PATH/openwrt
 src-link routing PATH/routing
+src-link tunneldigger PATH/tunneldigger
 src-link fastd PATH/fastd
+src-link libremap PATH/libremap
 src-link packagesol PATH/ffol
diff --git a/buildscript b/buildscript
index 001d0b443c2dff656e5f13039792a40d4ec08ce1..6cc511938832abe92f846996ff596e4221c4a466 100755
--- a/buildscript
+++ b/buildscript
@@ -53,6 +53,20 @@ get_source() {
 	test -d fastd || git clone git://git.metameute.de/lff/pkg_fastd fastd
 	git --git-dir=fastd/.git --work-tree=fastd/ checkout v10
 
+    if [ ! -d tunneldigger ]; then
+        git init tunneldigger
+        cd tunneldigger/
+        git remote add -f origin https://github.com/wlanslovenija/firmware-packages-opkg.git
+        git config core.sparsecheckout true
+        echo net/tunneldigger/ >> .git/info/sparse-checkout
+        git pull origin
+        cd ..
+    fi
+    git --git-dir=tunneldigger/.git --work-tree=tunneldigger checkout a022ddaafb7595aa22084851eddf8650460fa8e7
+
+    test -d libremap || git clone https://github.com/libremap/libremap-agent-openwrt.git libremap
+    git --git-dir=libremap/.git --work-tree=libremap checkout fa994c7900b6331092c2262116ecc7410621e4ac
+
 	cd .. # packages
 	cd .. # src
 }
@@ -77,6 +91,8 @@ prepare() {
 	
 	$target/scripts/feeds install -p packagesol nodewatcher
 	$target/scripts/feeds install -p fastd fastd libuecc
+	$target/scripts/feeds install -p tunneldigger tunneldigger
+	$target/scripts/feeds install -p libremap libremap-agent
 	$target/scripts/feeds install -p routing alfred kmod-batman-adv kmod-batgat
 	$target/scripts/feeds install -p openwrt bridge ethtool gpioctl-sysfs horst libugpio mii-tool wavemon kmod-gpiotoggling