diff --git a/pkg/wd/Dockerfile b/pkg/wd/Dockerfile
new file mode 100644
index 000000000..fd8b6774b
--- /dev/null
+++ b/pkg/wd/Dockerfile
@@ -0,0 +1,9 @@
+# vim: ft=dockerfile
+
+FROM ubuntu:20.04
+
+COPY mksapkg-OS5 /mksapkg-OS5
+
+COPY entrypoint.sh /entrypoint.sh
+ENTRYPOINT ["/entrypoint.sh"]
+
diff --git a/pkg/wd/build.sh b/pkg/wd/build.sh
new file mode 100755
index 000000000..36f81022f
--- /dev/null
+++ b/pkg/wd/build.sh
@@ -0,0 +1,13 @@
+#!/bin/bash
+
+build_packages()
+{
+ sudo docker run -v $(pwd):/zto ztwd
+}
+
+build_dockerfile()
+{
+ sudo docker build -t ztwd . --load
+}
+
+"$@"
diff --git a/pkg/wd/entrypoint.sh b/pkg/wd/entrypoint.sh
new file mode 100755
index 000000000..8e10c9ffe
--- /dev/null
+++ b/pkg/wd/entrypoint.sh
@@ -0,0 +1,98 @@
+#!/bin/sh
+
+ZTO_VER=$(git describe --abbrev=0 --tags)
+ZTO_COMMIT=$(git rev-parse HEAD)
+ZTO_DESC=$(jq -r '.desc' ../config.json)
+
+generate_new_pkg_spec()
+{
+ cat > zerotier/apkg.rc <<- EOM
+Package: zerotier
+Section: Apps
+Version: $ZTO_VER
+Packager: ZeroTier, Inc.
+Email: contact@zerotier.com
+Homepage: http://www.zerotier.com
+Description: $ZTO_DESC
+AddonShowName: ZeroTier
+Icon: zerotier.png
+AddonIndexPage: index.html
+AddonUsedPort: 9993
+InstDepend:
+InstConflict:
+StartDepend:
+StartConflict:
+CenterType:1
+UserControl:0
+MinFWVer:
+MaxFWVer:
+IndividualFlag:
+
+EOM
+}
+
+pkg_x64()
+{
+ MKSAPKG=../mksapkg-OS5
+ chmod a+x $MKSAPKG
+ BIN_SRC_DIR=..
+
+ pushd zerotier
+
+ cp -f $BIN_SRC_DIR/zerotier-one bin/zerotier-one
+ $MKSAPKG -E -s -m WDMyCloudDL2100
+ $MKSAPKG -E -s -m WDMyCloudDL4100
+ $MKSAPKG -E -s -m MyCloudPR4100
+ $MKSAPKG -E -s -m MyCloudPR2100
+
+ popd
+}
+
+pkg_armhf()
+{
+ MKSAPKG=../mksapkg-OS5
+ chmod a+x $MKSAPKG
+ BIN_SRC_DIR=..
+
+ pushd zerotier
+ cp -f $BIN_SRC_DIR/zerotier-one bin/zerotier-one
+
+ # MyCloudEX2Ultra (Armada A385)
+ $MKSAPKG -E -s -m MyCloudEX2Ultra
+ # WDMyCloudEX4100 (Armada A385)
+ $MKSAPKG -E -s -m WDMyCloudEX4100
+ # WDMyCloudEX2100 (Armada A385)
+ $MKSAPKG -E -s -m WDMyCloudEX2100
+ # WDMyCloudEX4 (Armada A300)
+ $MKSAPKG -E -s -m WDMyCloudEX4
+ # WDMyCloudEX2 (Armada A370)
+ $MKSAPKG -E -s -m WDMyCloudEX2
+ # WDMyCloudMirrorGen2 (Armada A385)
+ $MKSAPKG -E -s -m WDMyCloudMirrorGen2
+ # WDMyCloudMirror (Armada A370)
+ $MKSAPKG -E -s -m WDMyCloudMirror
+ # WDCloud (Armada A375 (2 cores, 1GHz each, armhf, ARMv7l, Cortex A9, vfp, neon))
+ $MKSAPKG -E -s -m WDCloud
+
+ popd
+}
+
+normalize-filenames()
+{
+ for f in *'('*')'*
+ do
+ mv -i "$f" "${f/(*)/}"
+ done
+}
+
+clean()
+{
+ rm -rf *.bin zerotier/apkg.sign
+}
+
+generate_new_pkg_spec
+pkg_x64
+pkg_armhf
+normalize-filenames
+
+"$@"
diff --git a/pkg/wd/zerotier/apkg.rc b/pkg/wd/zerotier/apkg.rc
new file mode 100644
index 000000000..c01af66d1
--- /dev/null
+++ b/pkg/wd/zerotier/apkg.rc
@@ -0,0 +1,21 @@
+Package: zerotier
+Section: Apps
+Version: 1.8.8
+Packager: ZeroTier, Inc.
+Email: contact@zerotier.com
+Homepage: http://www.zerotier.com
+Description: Securely connect any device, anywhere.
+AddonShowName: ZeroTier
+Icon: zerotier.png
+AddonIndexPage: index.html
+AddonUsedPort: 9993
+InstDepend:
+InstConflict:
+StartDepend:
+StartConflict:
+CenterType:1
+UserControl:0
+MinFWVer:
+MaxFWVer:
+IndividualFlag:
+
diff --git a/pkg/wd/zerotier/apkg.xml b/pkg/wd/zerotier/apkg.xml
new file mode 100644
index 000000000..6ce296cc6
--- /dev/null
+++ b/pkg/wd/zerotier/apkg.xml
@@ -0,0 +1,37 @@
+
+
Welcome! ZeroTier is a peer-to-peer encrypted virtual networking solution that enables you to create Local Area Networks with static IP assignments for all of your devices. Access your NAS from anywhere in the world with a single IP and without the need of cloud services backhauling your traffic. To use the CLI:
+Using your (sshd) account, enable SSH:
+Settings
-> Network
-> SSH
From a computer, open a terminal and SSH into your NAS device:
+ssh sshd@your_nas_device_lan_ip
Create account and network ID at my.zerotier.com
+Join your device to the network:
+zerotier-cli join your_network_id
Use my.zerotier.com to authorize your NAS device to join your network.
+