diff --git a/SOURCES/sos-bz1887402-kexec-logs.patch b/SOURCES/sos-bz1887402-kexec-logs.patch
new file mode 100644
index 0000000..670659f
--- /dev/null
+++ b/SOURCES/sos-bz1887402-kexec-logs.patch
@@ -0,0 +1,40 @@
+From a0cb4efb473a553fa034aaa8980635897adf1894 Mon Sep 17 00:00:00 2001
+From: Jose Castillo <jcastillo@redhat.com>
+Date: Tue, 26 Jan 2021 16:20:44 +0100
+Subject: [PATCH] [kdump] Gather the file kexec-dmesg.log
+
+Moved the file name from kexec-kdump.log to
+the right one, kexec-dmesg.log and
+added it to the list of files to gather via
+add_copy_spec as per #1546.
+
+Resolves: RHBZ#1817042
+Resolves: #2386
+
+Signed-off-by: Jose Castillo <jcastillo@redhat.com>
+Signed-off-by: Pavel Moravec <pmoravec@redhat.com>
+---
+ sos/report/plugins/kdump.py | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/sos/report/plugins/kdump.py b/sos/report/plugins/kdump.py
+index 4eccb3ffe..6bcb7f74d 100644
+--- a/sos/report/plugins/kdump.py
++++ b/sos/report/plugins/kdump.py
+@@ -72,6 +72,7 @@ def setup(self):
+             "/etc/kdump.conf",
+             "/etc/udev/rules.d/*kexec.rules",
+             "/var/crash/*/vmcore-dmesg.txt",
++            "/var/crash/*/kexec-dmesg.log",
+             "/var/log/kdump.log"
+         ])
+         try:
+@@ -81,7 +82,7 @@ def setup(self):
+             path = "/var/crash"
+ 
+         self.add_copy_spec("{}/*/vmcore-dmesg.txt".format(path))
+-        self.add_copy_spec("{}/*/kexec-kdump.log".format(path))
++        self.add_copy_spec("{}/*/kexec-dmesg.log".format(path))
+ 
+ 
+ class DebianKDump(KDump, DebianPlugin, UbuntuPlugin):
diff --git a/SOURCES/sos-bz1916729-ftp-upload-no-passwd.patch b/SOURCES/sos-bz1916729-ftp-upload-no-passwd.patch
new file mode 100644
index 0000000..6b2b2fc
--- /dev/null
+++ b/SOURCES/sos-bz1916729-ftp-upload-no-passwd.patch
@@ -0,0 +1,35 @@
+From 486a7918934041306bae8ccc11da2196e8f4c9bb Mon Sep 17 00:00:00 2001
+From: Jake Hunsaker <jhunsake@redhat.com>
+Date: Wed, 13 Jan 2021 10:57:58 -0500
+Subject: [PATCH] [Policy] Handle additional FTP authentication issues
+
+It was found that some implementations will return a 530 rather than a
+503 as the more specific error for incorrect passwords. Handle this
+error code explicitly, and then also add a catch-all for any other
+ftplib errors that may get raised.
+
+Resolves: #2368
+
+Signed-off-by: Jake Hunsaker <jhunsake@redhat.com>
+---
+ sos/policies/__init__.py | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/sos/policies/__init__.py b/sos/policies/__init__.py
+index c5fb4801e..a4f550c96 100644
+--- a/sos/policies/__init__.py
++++ b/sos/policies/__init__.py
+@@ -477,9 +477,13 @@ def upload_ftp(self, url=None, directory=None, user=None, password=None):
+             errno = str(err).split()[0]
+             if errno == '503':
+                 raise Exception("could not login as '%s'" % user)
++            if errno == '530':
++                raise Exception("invalid password for user '%s'" % user)
+             if errno == '550':
+                 raise Exception("could not set upload directory to %s"
+                                 % directory)
++            raise Exception("error trying to establish session: %s"
++                            % str(err))
+ 
+         try:
+             with open(self.upload_archive, 'rb') as _arcfile:
diff --git a/SPECS/sos.spec b/SPECS/sos.spec
index 6e4549e..4fc7cde 100644
--- a/SPECS/sos.spec
+++ b/SPECS/sos.spec
@@ -5,7 +5,7 @@
 Summary: A set of tools to gather troubleshooting information from a system
 Name: sos
 Version: 4.0
-Release: 6%{?dist}
+Release: 7%{?dist}
 Group: Applications/System
 Source0: https://github.com/sosreport/sos/archive/%{version}/sos-%{version}.tar.gz
 Source1: sos-audit-%{auditversion}.tgz
@@ -38,6 +38,9 @@ Patch15: sos-bz1912889-plugopts-ignored-in-configfile.patch
 Patch16: sos-bz1912821-sos-collector-declare-sysroot.patch
 Patch17: sos-bz1912910-empty-file-stops-collecting.patch
 Patch18: sos-bz1917196-networking-ethtool-e-conditionally.patch
+Patch19: sos-bz1887402-kexec-logs.patch
+Patch20: sos-bz1916729-ftp-upload-no-passwd.patch
+
 
 %description
 Sos is a set of tools that gathers information about system
@@ -66,6 +69,8 @@ support technicians and developers.
 %patch16 -p1
 %patch17 -p1
 %patch18 -p1
+%patch19 -p1
+%patch20 -p1
 
 %build
 %py3_build
@@ -125,6 +130,12 @@ of the system.  Currently storage and filesystem commands are audited.
 %ghost /etc/audit/rules.d/40-sos-storage.rules
 
 %changelog
+* Fri Jan 29 2021 Pavel Moravec <pmoravec@redhat.com> = 4.0-7
+- [kdump] Gather the file kexec-dmesg.log
+  Resolves: bz1887402
+- [Policy] Handle additional FTP authentication issues
+  Resolves: bz1916729
+
 * Thu Jan 21 2021 Pavel Moravec <pmoravec@redhat.com> = 4.0-6
 - [networking] Collect 'ethtool -e <device>' conditionally only
   Resolves: bz1917196