diff --git a/abattis-cantarell-fonts.spec b/abattis-cantarell-fonts.spec
index 0c81286..816bd5f 100644
--- a/abattis-cantarell-fonts.spec
+++ b/abattis-cantarell-fonts.spec
@@ -31,17 +31,16 @@ It is a sans-serif humanist typeface family.
 
 %prep
 %autosetup -n %{actualname}-fonts-%{version} -S git
+# Force regeneration
+rm otf/*.otf
 
 %build
-%configure
+%configure --enable-source-rebuild
 make %{?_smp_mflags}
-ls -l ./src/
-fontforge -lang=ff -c 'Open($1); Generate($2);' src/%{archivename1}.sfd %{archivename1}.otf
-fontforge -lang=ff -c 'Open($1); Generate($2);' src/%{archivename2}.sfd %{archivename2}.otf
 
 %install
 install -m 0755 -d %{buildroot}%{_fontdir}
-install -m 0644 -p *.otf %{buildroot}%{_fontdir}
+install -m 0644 -p otf/*.otf %{buildroot}%{_fontdir}
 install -m 0755 -d %{buildroot}%{_fontconfig_templatedir} \
                    %{buildroot}%{_fontconfig_confdir}
 install -m 0644 -p fontconfig/%{fontconf} \
@@ -60,6 +59,7 @@ install -Dm 0644 -p %{SOURCE1} \
 %changelog
 * Tue Sep 08 2015 Kalev Lember <klember@redhat.com> - 0.0.16-4
 - Fix 'r' hinting
+- Use upstream build system rules when regenerating otf files
 
 * Tue Jun 16 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.0.16-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild