diff --git a/cross/wireguard-tools/Makefile b/cross/wireguard-tools/Makefile
new file mode 100644
index 00000000000..04fffd4b358
--- /dev/null
+++ b/cross/wireguard-tools/Makefile
@@ -0,0 +1,29 @@
+PKG_NAME = wireguard-tools
+PKG_VERS = 1.0.20200827
+PKG_EXT = tar.xz
+PKG_DIST_SITE = https://git.zx2c4.com/$(PKG_NAME)/snapshot
+PKG_DIST_NAME = $(PKG_NAME)-$(PKG_VERS).$(PKG_EXT)
+PKG_DIR =  $(PKG_NAME)-$(PKG_VERS)
+
+REQ_KERNEL = 1
+
+HOMEPAGE = https://www.wireguard.com
+COMMENT  = WireGuard® is an extremely simple yet fast and modern VPN that utilizes state-of-the-art cryptography. It aims to be faster, simpler, leaner, and more useful than IPsec, while avoiding the massive headache.
+LICENSE  = GPLv2
+
+ENV += WITH_WGQUICK=yes
+ENV += WITH_BASHCOMPLETION=no
+ENV += WITH_SYSTEMDUNITS=no
+ENV += PREFIX=$(STAGING_INSTALL_PREFIX)
+
+CONFIGURE_TARGET = noop
+COMPILE_TARGET = wireguard-compile
+INSTALL_TARGET = wireguard-install
+
+include ../../mk/spksrc.cross-cc.mk
+
+.PHONY: wireguard-compile wireguard-install
+wireguard-compile:
+	$(RUN) $(MAKE) -C src/
+wireguard-install:
+	$(RUN) $(MAKE) -C src/ install
diff --git a/cross/wireguard-tools/PLIST b/cross/wireguard-tools/PLIST
new file mode 100644
index 00000000000..435f83e8580
--- /dev/null
+++ b/cross/wireguard-tools/PLIST
@@ -0,0 +1,2 @@
+bin:bin/wg
+rsc:bin/wg-quick
diff --git a/cross/wireguard-tools/digests b/cross/wireguard-tools/digests
new file mode 100644
index 00000000000..df0af2f6d2d
--- /dev/null
+++ b/cross/wireguard-tools/digests
@@ -0,0 +1,3 @@
+wireguard-tools-1.0.20200827.tar.xz SHA1 96356ca99fe4fb2abaccb27fc336d6183df1979e
+wireguard-tools-1.0.20200827.tar.xz SHA256 51bc85e33a5b3cf353786ae64b0f1216d7a871447f058b6137f793eb0f53b7fd
+wireguard-tools-1.0.20200827.tar.xz MD5 70c4c1a0260d89ca27abdadad10f450b
diff --git a/cross/wireguard/Makefile b/cross/wireguard/Makefile
index 6eea639f6af..8bc83f9fc1a 100644
--- a/cross/wireguard/Makefile
+++ b/cross/wireguard/Makefile
@@ -1,20 +1,19 @@
 PKG_NAME = wireguard
-PKG_VERS = 0.0.20190406
+PKG_VERS = 1.0.20210124
 PKG_EXT = tar.xz
-PKG_DIST_SITE = https://git.zx2c4.com/WireGuard/snapshot
-PKG_DIST_NAME = WireGuard-$(PKG_VERS).$(PKG_EXT)
-PKG_DIR =  $(PKG_NAME)-$(PKG_VERS)
+PKG_DIST_SITE = https://git.zx2c4.com/wireguard-linux-compat/snapshot
+PKG_DIST_NAME = wireguard-linux-compat-$(PKG_VERS).$(PKG_EXT)
+PKG_DIR =  wireguard-linux-compat-$(PKG_VERS)
 
-REQ_KERNEL = 1
+REQUIRE_KERNEL = 1
 
 HOMEPAGE = https://www.wireguard.com
 COMMENT  = WireGuard® is an extremely simple yet fast and modern VPN that utilizes state-of-the-art cryptography. It aims to be faster, simpler, leaner, and more useful than IPsec, while avoiding the massive headache.
 LICENSE  = GPLv2
 
-DEPENDS = cross/libmnl
-
-CONFIGURE_TARGET = nope
+ENV += KERNELDIR=$(WORK_DIR)/linux
 
+CONFIGURE_TARGET = noop
 COMPILE_TARGET = wireguard-compile
 INSTALL_TARGET = wireguard-install
 
@@ -22,9 +21,6 @@ include ../../mk/spksrc.cross-cc.mk
 
 .PHONY: wireguard-compile wireguard-install
 wireguard-compile:
-	$(RUN) && cd $(WORK_DIR)/$(PKG_NAME)-$(PKG_VERS)/src && KERNELDIR=$(KERNEL_DIR) $(MAKE)
+	$(RUN) DESTDIR=$(STAGING_INSTALL_PREFIX) $(MAKE) -C src/ module
 wireguard-install:
-	install -m 755 -d $(STAGING_INSTALL_PREFIX)/bin
-	install -m 755 $(WORK_DIR)/$(PKG_NAME)-$(PKG_VERS)/src/tools/wg $(STAGING_INSTALL_PREFIX)/bin
-	install -m 755 $(WORK_DIR)/$(PKG_NAME)-$(PKG_VERS)/src/tools/wg-quick/linux.bash $(STAGING_INSTALL_PREFIX)/bin/wg-quick
-	install -m 644 $(WORK_DIR)/$(PKG_NAME)-$(PKG_VERS)/src/wireguard.ko $(STAGING_INSTALL_PREFIX)/
+	install -m 644 $(WORK_DIR)/$(PKG_DIR)/src/wireguard.ko $(STAGING_INSTALL_PREFIX)/
diff --git a/cross/wireguard/PLIST b/cross/wireguard/PLIST
index 47e62f96e4c..1e44b4ff85b 100644
--- a/cross/wireguard/PLIST
+++ b/cross/wireguard/PLIST
@@ -1,5 +1 @@
-bin:bin/wg
-lib:lib/libmnl.a
-rsc:lib/libmnl.la
 rsc:wireguard.ko
-rsc:bin/wg-quick
diff --git a/cross/wireguard/digests b/cross/wireguard/digests
index 8fdcda7060d..014e24423dd 100644
--- a/cross/wireguard/digests
+++ b/cross/wireguard/digests
@@ -1,3 +1,3 @@
-WireGuard-0.0.20190406.tar.xz SHA1 3aed7b6cedaf40eaa594d547e3c10f92fe1b9b2e
-WireGuard-0.0.20190406.tar.xz SHA256 2f06f3adf70b95e74a7736a22dcf6e9ef623b311a15b7d55b5474e57c3d0415b
-WireGuard-0.0.20190406.tar.xz MD5 c11254fe48695e61c145a7e82756ecba
+wireguard-linux-compat-1.0.20210124.tar.xz SHA1 c7f894357a0549b925f4471f26f8105b0287b25c
+wireguard-linux-compat-1.0.20210124.tar.xz SHA256 dac6e68cd4c3db441499850dfa8a70706384a3295f37fda1b839a50b79faef54
+wireguard-linux-compat-1.0.20210124.tar.xz MD5 45fe2a797dd57ff529f5f09d0754cef8
diff --git a/spk/wireguard/Makefile b/spk/wireguard/Makefile
index 092e9e53dfb..3ccdff47702 100644
--- a/spk/wireguard/Makefile
+++ b/spk/wireguard/Makefile
@@ -1,9 +1,9 @@
 SPK_NAME = wireguard
-SPK_VERS = 0.0.20190406
-SPK_REV = 0
+SPK_VERS = 1.0.20200827
+SPK_REV = 1
 SPK_ICON = src/wireguard.png
 
-DEPENDS = cross/bash cross/$(SPK_NAME)
+DEPENDS = cross/$(SPK_NAME) cross/$(SPK_NAME)-tools
 UNSUPPORTED_ARCHES = $(PPC_ARCHES)
 
 MAINTAINER = publicarray