diff --git a/.gitignore b/.gitignore
index 6e3a964..11a3ce6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,11 +1,8 @@
 # epel8-playground (split configuration)
-/proftpd-1.3.7rc3.tar.gz
+/proftpd-1.3.7rc4.tar.gz
 /v0.9.5.tar.gz
 # master/f32/f31/epel8 (split configuration)
-/proftpd-1.3.6c.tar.gz
-/v0.9.5.tar.gz
-# f30 (monolithic configuration)
-/proftpd-1.3.6c.tar.gz
+/proftpd-1.3.6d.tar.gz
 /v0.9.5.tar.gz
 # el7 (monolithic configuration)
 /proftpd-1.3.5e.tar.gz
diff --git a/cd9036f4.patch b/cd9036f4.patch
deleted file mode 100644
index 44ee43c..0000000
--- a/cd9036f4.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From cd9036f4ef7a05c107f0ffcb19a018b20267c531 Mon Sep 17 00:00:00 2001
-From: TJ Saunders <tj@castaglia.org>
-Date: Sat, 22 Feb 2020 09:40:32 -0800
-Subject: [PATCH] Issue #903: We want to remove the data transfer command pool,
- but we _do_ want some memory pool, lest we regress the %{transfer-status}
- LogFormat functionality.
-
----
- src/data.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/data.c b/src/data.c
-index 6ef6d420e..e7b03e231 100644
---- a/src/data.c
-+++ b/src/data.c
-@@ -897,7 +897,7 @@ void pr_data_abort(int err, int quiet) {
-     /* Forcibly clear the data-transfer instigating command pool from the
-      * Response API.
-      */
--    pr_response_set_pool(NULL);
-+    pr_response_set_pool(session.pool);
-   }
- 
-   if (true_abort) {
diff --git a/proftpd.spec b/proftpd.spec
index c60427d..b2e5cc8 100644
--- a/proftpd.spec
+++ b/proftpd.spec
@@ -66,12 +66,12 @@
 %undefine _strict_symbol_defs_build
 
 #global prever rc3
-%global baserelease 3
+%global baserelease 1
 %global mod_vroot_version 0.9.5
 
 Summary:		Flexible, stable and highly-configurable FTP server
 Name:			proftpd
-Version:		1.3.6c
+Version:		1.3.6d
 Release:		%{?prever:0.}%{baserelease}%{?prever:.%{prever}}%{?dist}
 License:		GPLv2+
 URL:			http://www.proftpd.org/
@@ -92,7 +92,6 @@ Patch2:			proftpd.conf-no-memcached.patch
 Patch3:			proftpd-1.3.4rc1-mod_vroot-test.patch
 Patch4:			proftpd-1.3.6-no-mod-wrap.patch
 Patch5:			proftpd-1.3.6-no-mod-geoip.patch
-Patch6:			https://github.com/proftpd/proftpd/commit/cd9036f4.patch
 Patch7:			proftpd-1.3.6c-logoptions.patch
 Patch8:			proftpd-1.3.6c-logging-not-systemd.patch
 
@@ -302,10 +301,6 @@ mv contrib/README contrib/README.contrib
 %patch5 -b .nogeoip
 %endif
 
-# Retain a memory pool after an aborted transfer so that the %{transfer-status}
-# LogFormat functionality still works
-%patch6 -p1
-
 # Add options to vary logging format
 # https://bugzilla.redhat.com/show_bug.cgi?id=1808989
 # http://bugs.proftpd.org/show_bug.cgi?id=4185
@@ -611,6 +606,26 @@ fi
 %{_mandir}/man1/ftpwho.1*
 
 %changelog
+* Sun May 31 2020 Paul Howarth <paul@city-fan.org> - 1.3.6d-1
+- Update to 1.3.6d
+  - Fixed issue with FTPS uploads of large files using TLSv1.3
+    (https://github.com/proftpd/proftpd/issues/959)
+  - Fixed regression in the handling of '%%{env:...}' configuration variables
+    when the environment variable is not present
+    (https://github.com/proftpd/proftpd/issues/857)
+  - Second LIST of the same symlink shows different results
+    (https://github.com/proftpd/proftpd/issues/940)
+  - mod_sftp sends broken response when CREATETIME attribute is requested
+    (https://github.com/proftpd/proftpd/issues/980)
+  - Handle zero-length SFTP WRITE requests without error
+    (http://bugs.proftpd.org/show_bug.cgi?id=4398)
+  - PidFile should not be world-writable
+    (https://github.com/proftpd/proftpd/issues/1018)
+  - TLSv1.3 handshake fails due to missing session ticket key on some systems
+    (https://github.com/proftpd/proftpd/issues/1014)
+  - Lowercased FTP commands not properly identified
+    (https://github.com/proftpd/proftpd/issues/1023)
+
 * Sat May  9 2020 Paul Howarth <paul@city-fan.org> - 1.3.6c-3
 - Avoid duplicate hostname and timestamps in syslog (#1808989)
   http://bugs.proftpd.org/show_bug.cgi?id=4185
diff --git a/sources b/sources
index 53775e5..2f0d435 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (proftpd-1.3.6c.tar.gz) = 9b10e603b26d527b594682a4905e70dc0a8361372ed80a8e2617167305047bf94ea16b441f9d5782ae04dd50768d32e12f9cb68708c1f80dcd219b09e0d4fd15
+SHA512 (proftpd-1.3.6d.tar.gz) = ca4d3afe6d2d3620f4d3033fdaefaac7414d91ab500c8e41a2f6ce17c4e41f1180e7b5217df1eea422f2745ac8d896c174f9ef57d5e76414f71c1ce763788855
 SHA512 (v0.9.5.tar.gz) = 10e4de29d84c2f2f5e88502fcd62768e2b0797b05a95fc22b59605e3c7377bfe3609c99e2f6fc2a17f9c3a267ff815c651ae39be8b6cb133565a4590f767353d