diff --git a/SOURCES/oaa-1.2-unicode_issues_PR124.patch b/SOURCES/oaa-1.2-unicode_issues_PR124.patch
new file mode 100644
index 0000000..9221ade
--- /dev/null
+++ b/SOURCES/oaa-1.2-unicode_issues_PR124.patch
@@ -0,0 +1,25 @@
+From 316d1fdd46e962c2eca32dde8b6d391286bd3d28 Mon Sep 17 00:00:00 2001
+From: Masahiro Matsuya <mmatsuya@redhat.com>
+Date: Fri, 7 Aug 2020 15:50:05 +0900
+Subject: [PATCH] avoiding UnicodeDecodeError in decode(). Output more errors
+ which starts with E: oscap
+
+---
+ org_fedora_oscap/common.py | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/org_fedora_oscap/common.py b/org_fedora_oscap/common.py
+index 9b4b7bf..45ce727 100644
+--- a/org_fedora_oscap/common.py
++++ b/org_fedora_oscap/common.py
+@@ -136,8 +136,9 @@ def execute(self, ** kwargs):
+ 
+         (stdout, stderr) = proc.communicate()
+         self.stdout = stdout.decode()
+-        self.stderr = stderr.decode()
++        self.stderr = stderr.decode(errors="replace")
+         self.messages = re.findall(r'OpenSCAP Error:.*', self.stderr)
++        self.messages = self.messages + re.findall(r'E: oscap:.*', self.stderr)
+ 
+         self.returncode = proc.returncode
+ 
diff --git a/SPECS/oscap-anaconda-addon.spec b/SPECS/oscap-anaconda-addon.spec
index daf6c26..6c6daa5 100644
--- a/SPECS/oscap-anaconda-addon.spec
+++ b/SPECS/oscap-anaconda-addon.spec
@@ -3,7 +3,7 @@
 
 Name:           oscap-anaconda-addon
 Version:        1.1.1
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        Anaconda addon integrating OpenSCAP to the installation process
 
 License:        GPLv2+
@@ -23,6 +23,7 @@ Patch2: 	oaa-1.2_warn-xorg.patch
 Patch3: 	oaa-1.2_warn-nfs-utils.patch
 Patch4: 	oaa-1.2_lang-streamline.patch
 Patch5: 	oaa-1.2_spoke-window_PR122.patch
+Patch6: 	oaa-1.2-unicode_issues_PR124.patch
 
 BuildArch:      noarch
 BuildRequires:  gettext
@@ -49,6 +50,7 @@ content.
 %patch3 -p1
 %patch4 -p1
 %patch5 -p1
+%patch6 -p1
 
 # As patches may translates the strings that are updated by later patches,
 # Patch1 needs to be aplied last.
@@ -74,6 +76,9 @@ make install DESTDIR=%{buildroot}
 %doc COPYING ChangeLog README.md
 
 %changelog
+* Tue Aug 18 2020 Matěj Týč <matyc@redhat.com> - 1.1.1-5
+- Fixed issues with encountering filenames with weird encoding during scans - rhbz#1867960
+
 * Thu Jul 09 2020 Matěj Týč <matyc@redhat.com> - 1.1.1-4
 - Fixed spoke window text: RHBZ#1855041