diff --git a/disable-broken-fontforge-in-rawhide.patch b/disable-broken-fontforge-in-rawhide.patch
index 2731b00..0fd4a02 100644
--- a/disable-broken-fontforge-in-rawhide.patch
+++ b/disable-broken-fontforge-in-rawhide.patch
@@ -6,7 +6,7 @@ index f8307a3..8e62905 100644
      message(FATAL_ERROR "Could not find FontForge executable")
  endif()
  
-+if (DISABLE_BROKEN_FONTFORGE_IN_RAWHIDE)
++if (FONTFORGE_IS_NOT_BROKEN)
  add_custom_target(regular ALL fontforge ${CMAKE_CURRENT_SOURCE_DIR}/generate-ttf.pe
                     ${CMAKE_CURRENT_SOURCE_DIR}/oxygen-fonts/Regular-400/src/Oxygen-Sans.sfd
                     ${CMAKE_CURRENT_BINARY_DIR}/Oxygen-Sans.ttf
@@ -20,6 +20,6 @@ index f8307a3..8e62905 100644
 +    ${CMAKE_SOURCE_DIR}/oxygen-fonts/mono-400/OxygenMono-Regular.ttf
 +    ${CMAKE_SOURCE_DIR}/oxygen-fonts/Regular-400/Oxygen-Sans.ttf
 +)
-+endif(DISABLE_BROKEN_FONTFORGE_IN_RAWHIDE)
++endif(FONTFORGE_IS_NOT_BROKEN)
 +
  install(FILES ${fontFiles} DESTINATION ${OXYGEN_FONT_INSTALL_DIR})
diff --git a/oxygen-fonts.spec b/oxygen-fonts.spec
index a8892bc..f1a0f23 100644
--- a/oxygen-fonts.spec
+++ b/oxygen-fonts.spec
@@ -14,6 +14,9 @@ Source1:        %{fontconf}-sans.conf
 Source2:        %{fontconf}-mono.conf
 
 #See https://bugzilla.redhat.com/show_bug.cgi?id=1147421
+%if 0%{?fedora} < 22
+%global fontforge -DFONTFORGE_IS_NOT_BROKEN:BOOL=ON
+%endif
 Patch0:         disable-broken-fontforge-in-rawhide.patch
 
 BuildArch:      noarch
@@ -65,7 +68,7 @@ developing applications that use %{name}.
 %build
 mkdir -p %{_target_platform}
 pushd %{_target_platform}
-%{cmake} .. -DOXYGEN_FONT_INSTALL_DIR=%{_fontdir}
+%{cmake} .. %{?fontforge} -DOXYGEN_FONT_INSTALL_DIR=%{_fontdir}
 popd
 
 make %{?_smp_mflags} -C %{_target_platform}