diff --git a/MAINTAINERS.md b/MAINTAINERS.md
new file mode 100644
--- /dev/null
+++ b/MAINTAINERS.md
@@ -0,0 +1,5 @@
+This file is used to indicate responsibility for the maintenance of this package. Individuals on this list should be the sole modifiers of the package, excluding cases where the Solus Team may need to perform necessary rebuilds, upgrades, or security fixes. This list should not be used for any direct contact usage. If you believe this package requires a package update, follow documentation from https://getsol.us/articles/packaging/request-a-package-update/en/. In the event this package no longer becomes sufficiently maintained, Core Team reserves the right to request a new maintainer or remove this package from the repository.
+
+- Silke Hofstra
+  - IRC: silkeh
+  - Email: silke@slxh.eu
diff --git a/Makefile b/Makefile
new file mode 100644
--- /dev/null
+++ b/Makefile
@@ -0,0 +1 @@
+include ../Makefile.common
diff --git a/abi_used_libs b/abi_used_libs
new file mode 100644
--- /dev/null
+++ b/abi_used_libs
@@ -0,0 +1 @@
+libc.so.6
diff --git a/package.yml b/package.yml
new file mode 100644
--- /dev/null
+++ b/package.yml
@@ -0,0 +1,20 @@
+name       : wireguard-tools
+version    : 1.0.20200513
+release    : 1
+source     :
+    - https://git.zx2c4.com/wireguard-tools/snapshot/wireguard-tools-1.0.20200513.tar.xz : e73409a9fb8c90506db241d1e1a4e7372a60dbfa400e37f4ab2fd70a92ba495f
+license    : GPL-2.0-only
+component  : network.util
+summary    : Required tools for WireGuard, such as wg(8) and wg-quick(8)
+description: |
+    This supplies the main userspace tooling for using and configuring WireGuard tunnels, including the wg(8) and wg-quick(8) utilities.
+environment: |
+    export WITH_WGQUICK=yes
+    export WITH_SYSTEMDUNITS=yes
+build      : |
+    %make -C src
+install    : |
+    %make_install -C src
+
+    # Remove empty directories
+    rm -r $installdir/etc
diff --git a/pspec_x86_64.xml b/pspec_x86_64.xml
new file mode 100644
--- /dev/null
+++ b/pspec_x86_64.xml
@@ -0,0 +1,41 @@
+<PISI>
+    <Source>
+        <Name>wireguard-tools</Name>
+        <Packager>
+            <Name>Silke Hofstra</Name>
+            <Email>silke@slxh.eu</Email>
+        </Packager>
+        <License>GPL-2.0-only</License>
+        <PartOf>network.util</PartOf>
+        <Summary xml:lang="en">Required tools for WireGuard, such as wg(8) and wg-quick(8)</Summary>
+        <Description xml:lang="en">This supplies the main userspace tooling for using and configuring WireGuard tunnels, including the wg(8) and wg-quick(8) utilities.
+</Description>
+        <Archive type="binary" sha1sum="79eb0752a961b8e0d15c77d298c97498fbc89c5a">https://getsol.us/sources/README.Solus</Archive>
+    </Source>
+    <Package>
+        <Name>wireguard-tools</Name>
+        <Summary xml:lang="en">Required tools for WireGuard, such as wg(8) and wg-quick(8)</Summary>
+        <Description xml:lang="en">This supplies the main userspace tooling for using and configuring WireGuard tunnels, including the wg(8) and wg-quick(8) utilities.
+</Description>
+        <PartOf>network.util</PartOf>
+        <Files>
+            <Path fileType="executable">/usr/bin/wg</Path>
+            <Path fileType="executable">/usr/bin/wg-quick</Path>
+            <Path fileType="library">/usr/lib/systemd/system/wg-quick.target</Path>
+            <Path fileType="library">/usr/lib/systemd/system/wg-quick@.service</Path>
+            <Path fileType="data">/usr/share/bash-completion/completions/wg</Path>
+            <Path fileType="data">/usr/share/bash-completion/completions/wg-quick</Path>
+            <Path fileType="man">/usr/share/man/man8/wg-quick.8</Path>
+            <Path fileType="man">/usr/share/man/man8/wg.8</Path>
+        </Files>
+    </Package>
+    <History>
+        <Update release="1">
+            <Date>2020-07-08</Date>
+            <Version>1.0.20200513</Version>
+            <Comment>Packaging update</Comment>
+            <Name>Silke Hofstra</Name>
+            <Email>silke@slxh.eu</Email>
+        </Update>
+    </History>
+</PISI>
\ No newline at end of file