diff --git a/lftp-4.8.4-tls-close.patch b/lftp-4.8.4-tls-close.patch
index 986b2ff..13ee8c9 100644
--- a/lftp-4.8.4-tls-close.patch
+++ b/lftp-4.8.4-tls-close.patch
@@ -1,8 +1,8 @@
-commit 299a194cc86ea81c40d2146dd095dda3954efc81
+commit cf7867757a4f888942b9600a5cc95ff2befabd75
 Author: Tomas Korbar <tkorbar@redhat.com>
-Date:   Tue May 6 12:01:10 2025 +0200
+Date:   Thu Jun 26 11:31:03 2025 +0200
 
-    Ensure proper closing of TLS connection
+    Ensure close-notify is sent on end of TLS connection
 
 diff --git a/src/buffer.cc b/src/buffer.cc
 index 9ee6580..e54e20e 100644
@@ -106,7 +106,7 @@ index d3cf7f0..8915066 100644
  #endif
  
 diff --git a/src/lftp_ssl.cc b/src/lftp_ssl.cc
-index 0a0078a..8820b6f 100644
+index 0a0078a..b994bfe 100644
 --- a/src/lftp_ssl.cc
 +++ b/src/lftp_ssl.cc
 @@ -45,6 +45,7 @@ lftp_ssl_base::lftp_ssl_base(int fd1,handshake_mode_t m,const char *h)
@@ -129,7 +129,7 @@ index 0a0078a..8820b6f 100644
 -      gnutls_bye(session,GNUTLS_SHUT_RDWR);  // FIXME - E_AGAIN
 +   int res;
 +   if(handshake_done) {
-+      res = gnutls_bye(session,GNUTLS_SHUT_RDWR);
++      res = gnutls_bye(session,GNUTLS_SHUT_WR);
 +      if (res == GNUTLS_E_SUCCESS) {
 +         goodbye_done = true;
 +         return DONE;
diff --git a/lftp.spec b/lftp.spec
index 42642e5..e9345ad 100644
--- a/lftp.spec
+++ b/lftp.spec
@@ -1,7 +1,7 @@
 Summary:	A sophisticated file transfer program
 Name:		lftp
 Version:	4.8.4
-Release:	4%{?dist}
+Release:	5%{?dist}
 License:	GPLv3+
 Group:		Applications/Internet
 Source0:	http://lftp.yar.ru/ftp/%{name}-%{version}.tar.xz
@@ -107,6 +107,10 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Thu Jun 26 2025 Tomas Korbar <tkorbar@redhat.com> - 4.8.4-5
+- Improve fix for close of TLS connection
+- Resolves: RHEL-99571
+
 * Tue May 06 2025 Tomas Korbar <tkorbar@redhat.com> - 4.8.4-4
 - Ensure proper closing of TLS connection
 - Resolves: RHEL-88955