diff --git a/ad786eaa.patch b/ad786eaa.patch
new file mode 100644
index 0000000..7e5dd2e
--- /dev/null
+++ b/ad786eaa.patch
@@ -0,0 +1,23 @@
+From ad786eaa8a232795470dbeab2380dc8d8ac803af Mon Sep 17 00:00:00 2001
+From: TJ Saunders <tj@castaglia.org>
+Date: Fri, 27 Oct 2017 09:28:19 -0700
+Subject: [PATCH] Merge pull request #617 from pghmcfc/systemd-network-online
+
+systemd: use network-online.target
+---
+ contrib/dist/rpm/proftpd.service | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/contrib/dist/rpm/proftpd.service b/contrib/dist/rpm/proftpd.service
+index 8a4df33c9..6c81db398 100644
+--- a/contrib/dist/rpm/proftpd.service
++++ b/contrib/dist/rpm/proftpd.service
+@@ -1,6 +1,7 @@
+ [Unit]
+ Description = ProFTPD FTP Server
+-After = network.target nss-lookup.target local-fs.target remote-fs.target
++Wants=network-online.target
++After=network-online.target nss-lookup.target local-fs.target remote-fs.target
+ 
+ [Service]
+ Type = simple
diff --git a/proftpd.spec b/proftpd.spec
index 5b5e816..b74fdfc 100644
--- a/proftpd.spec
+++ b/proftpd.spec
@@ -45,7 +45,7 @@
 %global _hardened_build 1
 
 #global prever rc3
-%global rpmrel 7
+%global rpmrel 8
 %global mod_vroot_version 0.9.5
 
 Summary:		Flexible, stable and highly-configurable FTP server
@@ -79,6 +79,7 @@ Patch110:		https://github.com/proftpd/proftpd/commit/7907aa65.patch
 Patch111:		https://github.com/proftpd/proftpd/commit/08ba2f63.patch
 Patch112:		https://github.com/proftpd/proftpd/commit/757b9633.patch
 Patch113:		https://github.com/proftpd/proftpd/commit/41ecb7dc.patch
+Patch114:		https://github.com/proftpd/proftpd/commit/ad786eaa.patch
 
 BuildRequires:		coreutils
 BuildRequires:		gcc
@@ -304,6 +305,11 @@ mv contrib/README contrib/README.contrib
 # http://bugs.proftpd.org/show_bug.cgi?id=4309
 %patch113 -p1
 
+# With systemd, wait for network-online.target before starting
+# https://bugzilla.redhat.com/show_bug.cgi?id=1506805
+# https://github.com/proftpd/proftpd/pull/617
+%patch114 -p1
+
 # OpenSSL Cipher Profiles introduced in Fedora 21
 # Elsewhere, we use the default of DEFAULT:!ADH:!EXPORT:!DES
 %if 0%{?fedora} < 21 && 0%{?rhel} < 8
@@ -574,6 +580,9 @@ fi
 %{_mandir}/man1/ftpwho.1*
 
 %changelog
+* Mon Oct 30 2017 Paul Howarth <paul@city-fan.org> - 1.3.6-8
+- With systemd, wait for network-online.target before starting (#1506805)
+
 * Thu Sep 21 2017 Paul Howarth <paul@city-fan.org> - 1.3.6-7
 - Switch to build with MariaDB Connector/C library rather than full mysql-devel
   package from Fedora 28 onwards (#1493657,