diff --git a/packages/addons/tools/network-tools/changelog.txt b/packages/addons/tools/network-tools/changelog.txt
index b50fd4f032..d6a931f8a1 100644
--- a/packages/addons/tools/network-tools/changelog.txt
+++ b/packages/addons/tools/network-tools/changelog.txt
@@ -1,3 +1,6 @@
+104
+- drop iw
+
 103
 - added rar2fs
 - updated iperf to 3.6
diff --git a/packages/addons/tools/network-tools/package.mk b/packages/addons/tools/network-tools/package.mk
index ea230985fb..b912874f2d 100644
--- a/packages/addons/tools/network-tools/package.mk
+++ b/packages/addons/tools/network-tools/package.mk
@@ -3,7 +3,7 @@
 
 PKG_NAME="network-tools"
 PKG_VERSION="1.0"
-PKG_REV="103"
+PKG_REV="104"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="https://libreelec.tv"
@@ -11,7 +11,7 @@ PKG_URL=""
 PKG_DEPENDS_TARGET="toolchain"
 PKG_SECTION="virtual"
 PKG_SHORTDESC="A bundle of network tools and programs"
-PKG_LONGDESC="This bundle currently includes bwm-ng, iftop, iperf, irssi, iw, lftp, ncftp, ngrep, nmap, rar2fs, rsync, sshfs, tcpdump, udpxy and wireless_tools."
+PKG_LONGDESC="This bundle currently includes bwm-ng, iftop, iperf, irssi, lftp, ncftp, ngrep, nmap, rar2fs, rsync, sshfs, tcpdump, udpxy and wireless_tools."
 
 PKG_IS_ADDON="yes"
 PKG_ADDON_NAME="Network Tools"
@@ -22,7 +22,6 @@ PKG_DEPENDS_TARGET="toolchain \
                     iftop \
                     iperf \
                     irssi \
-                    iw \
                     lftp \
                     ncftp \
                     ngrep \
@@ -49,9 +48,6 @@ addon() {
     # irssi
     cp -P $(get_build_dir irssi)/.$TARGET_NAME/src/fe-text/irssi $ADDON_BUILD/$PKG_ADDON_ID/bin
 
-    # iw
-    cp -P $(get_build_dir iw)/iw $ADDON_BUILD/$PKG_ADDON_ID/bin
-
     # lftp
     cp -P $(get_build_dir lftp)/.$TARGET_NAME/src/lftp $ADDON_BUILD/$PKG_ADDON_ID/bin
 
diff --git a/packages/addons/addon-depends/network-tools-depends/iw/package.mk b/packages/network/iw/package.mk
similarity index 84%
rename from packages/addons/addon-depends/network-tools-depends/iw/package.mk
rename to packages/network/iw/package.mk
index 54dee4164e..e1245e97f6 100644
--- a/packages/addons/addon-depends/network-tools-depends/iw/package.mk
+++ b/packages/network/iw/package.mk
@@ -15,6 +15,7 @@ pre_configure_target() {
   export LDFLAGS="$LDFLAGS -pthread"
 }
 
-makeinstall_target() {
-  : # meh
+post_makeinstall_target() {
+  mkdir -p $INSTALL/usr/lib/iw
+    cp $PKG_DIR/scripts/setregdomain $INSTALL/usr/lib/iw
 }
diff --git a/packages/network/iw/scripts/setregdomain b/packages/network/iw/scripts/setregdomain
new file mode 100755
index 0000000000..538bfddb51
--- /dev/null
+++ b/packages/network/iw/scripts/setregdomain
@@ -0,0 +1,8 @@
+#!/bin/sh
+
+REGDOMAIN=
+REGDOMAIN_CONF="/storage/.cache/regdomain.conf"
+[ -r "$REGDOMAIN_CONF" ] && . "$REGDOMAIN_CONF"
+[ -z "$REGDOMAIN" ] && exit 0
+
+exec /usr/sbin/iw reg set "$REGDOMAIN"
diff --git a/packages/network/iw/udev.d/60-iw-regdomain.rules b/packages/network/iw/udev.d/60-iw-regdomain.rules
new file mode 100644
index 0000000000..a9f929c45b
--- /dev/null
+++ b/packages/network/iw/udev.d/60-iw-regdomain.rules
@@ -0,0 +1 @@
+SUBSYSTEM=="ieee80211", ACTION=="add", RUN+="/usr/lib/iw/setregdomain"
diff --git a/packages/virtual/network/package.mk b/packages/virtual/network/package.mk
index c13737907c..5700dd7773 100644
--- a/packages/virtual/network/package.mk
+++ b/packages/virtual/network/package.mk
@@ -4,9 +4,9 @@
 PKG_NAME="network"
 PKG_VERSION=""
 PKG_LICENSE="various"
-PKG_SITE="http://www.openelec.tv"
+PKG_SITE="https://libreelec.tv"
 PKG_URL=""
-PKG_DEPENDS_TARGET="toolchain connman netbase ethtool openssh"
+PKG_DEPENDS_TARGET="toolchain connman netbase ethtool openssh iw"
 PKG_SECTION="virtual"
 PKG_LONGDESC="Metapackage for various packages to install network support"