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,6 @@
+libc.so.6
+libcrypto.so.1.0.0
+libpthread.so.0
+libssl.so.1.0.0
+libsystemd.so.0
+libutil.so.1
diff --git a/files/stunnel-systemd-service.patch b/files/stunnel-systemd-service.patch
new file mode 100644
--- /dev/null
+++ b/files/stunnel-systemd-service.patch
@@ -0,0 +1,18 @@
+diff --git a/tools/stunnel.service.in b/tools/stunnel.service.in
+index 53ad3e7..620a0e7 100644
+--- a/tools/stunnel.service.in
++++ b/tools/stunnel.service.in
+@@ -1,10 +1,11 @@
+ [Unit]
+ Description=TLS tunnel for network daemons
+-After=syslog.target
++After=syslog.target network.target
+ 
+ [Service]
+ ExecStart=@bindir@/stunnel
+ Type=forking
++PrivateTmp=true
+ 
+ [Install]
+ WantedBy=multi-user.target
+
diff --git a/package.yml b/package.yml
new file mode 100644
--- /dev/null
+++ b/package.yml
@@ -0,0 +1,23 @@
+name       : stunnel
+version    : 5.44
+release    : 1
+source     :
+    - https://www.stunnel.org/downloads/stunnel-5.44.tar.gz : 990a325dbb47d77d88772dd02fbbd27d91b1fea3ece76c9ff4461eca93f12299
+license    : GPL-2.0
+component  : network.util
+summary    : TLS offloading and load-balancing proxy
+description: |
+    The stunnel program is designed to work as TLS encryption wrapper between remote clients and local (inetd-startable) or remote servers. The concept is that having non-TLS aware daemons running on your system you can easily set them up to communicate with clients over secure TLS channels.
+    
+    stunnel can be used to add TLS functionality to commonly used Inetd daemons like POP-2, POP-3, and IMAP servers, to standalone daemons like NNTP, SMTP and HTTP, and in tunneling PPP over network sockets without changes to the source code.
+setup      : |
+    %patch -p1 < $pkgfiles/stunnel-systemd-service.patch
+    %configure
+build      : |
+    %make
+install    : |
+    %make_install
+    install -D -m00644 $installdir/usr/share/doc/stunnel/examples/stunnel.service -t $installdir/%libdir%/systemd/system
+
+    rm $installdir/usr/share/doc/stunnel/INSTALL.{W32,WCE}
+    rm $installdir/usr/share/doc/stunnel/examples/stunnel.{rh.init,spec}
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,44 @@
+<PISI>
+    <Source>
+        <Name>stunnel</Name>
+        <Packager>
+            <Name>Pierre-Yves</Name>
+            <Email>pyu@riseup.net</Email>
+        </Packager>
+        <License>GPL-2.0</License>
+        <PartOf>network.util</PartOf>
+        <Summary xml:lang="en">TLS offloading and load-balancing proxy</Summary>
+        <Description xml:lang="en">The stunnel program is designed to work as TLS encryption wrapper between remote clients and local (inetd-startable) or remote servers. The concept is that having non-TLS aware daemons running on your system you can easily set them up to communicate with clients over secure TLS channels.
+
+stunnel can be used to add TLS functionality to commonly used Inetd daemons like POP-2, POP-3, and IMAP servers, to standalone daemons like NNTP, SMTP and HTTP, and in tunneling PPP over network sockets without changes to the source code.
+</Description>
+        <Archive type="binary" sha1sum="79eb0752a961b8e0d15c77d298c97498fbc89c5a">https://solus-project.com/sources/README.Solus</Archive>
+    </Source>
+    <Package>
+        <Name>stunnel</Name>
+        <Summary xml:lang="en">TLS offloading and load-balancing proxy</Summary>
+        <Description xml:lang="en">The stunnel program is designed to work as TLS encryption wrapper between remote clients and local (inetd-startable) or remote servers. The concept is that having non-TLS aware daemons running on your system you can easily set them up to communicate with clients over secure TLS channels.
+
+stunnel can be used to add TLS functionality to commonly used Inetd daemons like POP-2, POP-3, and IMAP servers, to standalone daemons like NNTP, SMTP and HTTP, and in tunneling PPP over network sockets without changes to the source code.
+</Description>
+        <PartOf>network.util</PartOf>
+        <Files>
+            <Path fileType="config">/etc/stunnel/stunnel.conf-sample</Path>
+            <Path fileType="executable">/usr/bin</Path>
+            <Path fileType="library">/usr/lib64/stunnel/libstunnel.so</Path>
+            <Path fileType="library">/usr/lib64/systemd/system/stunnel.service</Path>
+            <Path fileType="doc">/usr/share/doc</Path>
+            <Path fileType="man">/usr/share/man</Path>
+            <Path fileType="data">/var/lib/stunnel</Path>
+        </Files>
+    </Package>
+    <History>
+        <Update release="1">
+            <Date>2018-01-06</Date>
+            <Version>5.44</Version>
+            <Comment>Packaging update</Comment>
+            <Name>Pierre-Yves</Name>
+            <Email>pyu@riseup.net</Email>
+        </Update>
+    </History>
+</PISI>
\ No newline at end of file