diff --git a/meta-citadel/recipes-support/wireguard-tools/wireguard-tools.inc b/meta-citadel/recipes-support/wireguard-tools/wireguard-tools.inc
index d246201..97111e2 100644
--- a/meta-citadel/recipes-support/wireguard-tools/wireguard-tools.inc
+++ b/meta-citadel/recipes-support/wireguard-tools/wireguard-tools.inc
@@ -11,7 +11,7 @@ LICENSE = "GPLv2"
 LIC_FILES_CHKSUM = "file://../COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263"
 
 SRC_URI = "https://git.zx2c4.com/WireGuard/snapshot/WireGuard-${PV}.tar.xz"
-SRC_URI[md5sum] = "890feb4f43886b84d9161ae223957f96"
-SRC_URI[sha256sum] = "c120cdedc3967dcb4ad5c1c7eadd2a1b04ef5dbf2fe60cc8e7c0db337bcda7dc"
+SRC_URI[md5sum] = "2294b97a3aa8ceaff90f516912631c8b"
+SRC_URI[sha256sum] = "5e38d554f7d1e3a64e3a5319ca1a3b790c84ed89c896586c490a93ac1f953a91"
 
 S = "${WORKDIR}/WireGuard-${PV}/src/"
diff --git a/meta-citadel/recipes-support/wireguard-tools/wireguard-tools_0.0.20180708.bb b/meta-citadel/recipes-support/wireguard-tools/wireguard-tools_0.0.20180708.bb
new file mode 100644
index 0000000..10400ad
--- /dev/null
+++ b/meta-citadel/recipes-support/wireguard-tools/wireguard-tools_0.0.20180708.bb
@@ -0,0 +1,34 @@
+require wireguard-tools.inc
+
+inherit bash-completion systemd pkgconfig
+
+DEPENDS = "libmnl"
+
+do_compile_prepend () {
+    cd ${S}/tools
+}
+
+do_unpack () {
+    tar -xvf ${DL_DIR}/WireGuard-0.0.20180708.tar.xz -C ${WORKDIR}/
+    # Remove symlink pointing to non-existent file as this causes the
+    # reproducible_build .bbclass to fail
+    rm ${WORKDIR}/WireGuard-0.0.20180708/src/tools/wg-quick/wg
+}
+
+do_install () {
+    cd ${S}/tools
+    oe_runmake DESTDIR="${D}" PREFIX="${prefix}" SYSCONFDIR="${sysconfdir}" \
+        SYSTEMDUNITDIR="${systemd_unitdir}" \
+        WITH_SYSTEMDUNITS=${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'yes', '', d)} \
+        WITH_BASHCOMPLETION=yes \
+        WITH_WGQUICK=yes \
+        install
+}
+
+FILES_${PN} = " \
+    ${sysconfdir} \
+    ${systemd_unitdir} \
+    ${bindir} \
+"
+
+RDEPENDS_${PN} = "bash"