diff --git a/SOURCES/fontforge-20170731-covscan-issue-fix-revertbad.patch b/SOURCES/fontforge-20170731-covscan-issue-fix-revertbad.patch
new file mode 100644
index 0000000..2711e7b
--- /dev/null
+++ b/SOURCES/fontforge-20170731-covscan-issue-fix-revertbad.patch
@@ -0,0 +1,12 @@
+diff -Naurp a/fontforge/sfd.c b/fontforge/sfd.c
+--- a/fontforge/sfd.c	2019-05-29 13:49:19.779285493 -0300
++++ b/fontforge/sfd.c	2019-05-29 14:02:42.013828803 -0300
+@@ -8302,7 +8302,7 @@ bool SFD_GetFontMetaData( FILE *sfd,
+         //
+         return false;
+     }
+-    free(kc);
++    //free(kc);
+     return true;
+ }
+ 
diff --git a/SPECS/fontforge.spec b/SPECS/fontforge.spec
index 1ace43b..748375a 100644
--- a/SPECS/fontforge.spec
+++ b/SPECS/fontforge.spec
@@ -4,7 +4,7 @@
 
 Name:           fontforge
 Version:        %{gittag0}
-Release:        8%{?dist}
+Release:        8%{?dist}.0.1
 Summary:        Outline and bitmap font editor
 
 License:        GPLv3+
@@ -18,6 +18,8 @@ Patch0:         fontforge-20140813-use-system-uthash.patch
 Patch1:         Add-python3-support.patch
 Patch2:         fontforge-20170731-covscan-issue-fix.patch
 
+Patch9999:      fontforge-20170731-covscan-issue-fix-revertbad.patch
+
 Requires:       xdg-utils
 Requires:       autotrace
 Requires:       hicolor-icon-theme
@@ -156,6 +158,9 @@ chmod 644 $RPM_BUILD_ROOT%{_datadir}/fontforge/nodejs/collabwebview/js/contentEd
 %doc htdocs
 
 %changelog
+* Wed May 29 2019 Pablo Greco <pgreco@centosproject.org> - 20170731-8.0.1
+- Fix segfault building some fonts (https://bugzilla.redhat.com/show_bug.cgi?id=1665939)
+
 * Tue Oct 30 2018 Parag Nemade <pnemade AT redhat DOT com> - 20170731-8
 - Resolves:rh#1644224 - fix some issues from covscan patch