diff --git a/wine.spec b/wine.spec
index 2b09669..34e0e1d 100644
--- a/wine.spec
+++ b/wine.spec
@@ -98,12 +98,7 @@ Source900: https://github.com/wine-staging/wine-staging/archive/v%{version}.tar.
 %endif
 
 %if !%{?no64bit}
-%if 0%{fedora} > 36
-ExclusiveArch:  %{ix86} x86_64 aarch64
-%else
-# Fedora 36 Clang doesn't build PE binaries on ARM at the moment
 ExclusiveArch:  %{ix86} x86_64
-%endif
 %else
 ExclusiveArch:  %{ix86}
 %endif
@@ -1368,8 +1363,10 @@ fi
 %{_libdir}/wine/%{winepedir}/dxdiagn.dll
 %ghost %{_libdir}/wine/%{winepedir}/dxgi.dll
 %{_libdir}/wine/%{winepedir}/wine-dxgi.dll
+%if 0%{?wine_staging}
 %{_libdir}/wine/%{winepedir}/dxgkrnl.sys
 %{_libdir}/wine/%{winepedir}/dxgmms1.sys
+%endif
 %{_libdir}/wine/%{winepedir}/dxtrans.dll
 %{_libdir}/wine/%{winepedir}/dxva2.dll
 %{_libdir}/wine/%{winepedir}/esent.dll
@@ -1434,9 +1431,7 @@ fi
 %{_libdir}/wine/%{winepedir}/ksproxy.ax
 %{_libdir}/wine/%{winepedir}/ksuser.dll
 %{_libdir}/wine/%{winepedir}/ktmw32.dll
-%if 0%{?fedora} > 24
 %{_libdir}/wine/%{winepedir}/l3codeca.acm
-%endif
 %{_libdir}/wine/%{winepedir}/light.msstyles
 %{_libdir}/wine/%{winepedir}/loadperf.dll
 %{_libdir}/wine/%{winesodir}/localspl.so
@@ -1721,18 +1716,20 @@ fi
 %{_libdir}/wine/%{winepedir}/wevtsvc.dll
 %{_libdir}/wine/%{winepedir}/wiaservc.dll
 %{_libdir}/wine/%{winepedir}/wimgapi.dll
+%if 0%{?wine_staging}
 %{_libdir}/wine/%{winepedir}/win32k.sys
+%endif
 %{_libdir}/wine/%{winepedir}/win32u.dll
 %{_libdir}/wine/%{winepedir}/windows.devices.enumeration.dll
 %{_libdir}/wine/%{winepedir}/windows.gaming.ui.gamebar.dll
-%if 0%{?wine_staging}
 %{_libdir}/wine/%{winepedir}/windows.gaming.input.dll
 %{_libdir}/wine/%{winepedir}/windows.globalization.dll
 %{_libdir}/wine/%{winepedir}/windows.media.speech.dll
-%endif
 %{_libdir}/wine/%{winepedir}/windows.media.dll
 %{_libdir}/wine/%{winepedir}/windows.media.devices.dll
+%if 0%{?wine_staging}
 %{_libdir}/wine/%{winepedir}/windows.networking.connectivity
+%endif
 %{_libdir}/wine/%{winepedir}/windows.networking.dll
 %{_libdir}/wine/%{winepedir}/windowscodecs.dll
 %{_libdir}/wine/%{winepedir}/windowscodecsext.dll
@@ -1780,11 +1777,9 @@ fi
 %{_libdir}/wine/%{winepedir}/wow64.dll
 %{_libdir}/wine/%{winepedir}/wow64win.dll
 %endif
-%if 0%{?wine_staging}
 %ifarch x86_64
 %{_libdir}/wine/%{winepedir}/wow64cpu.dll
 %endif
-%endif
 %{_libdir}/wine/%{winepedir}/wpc.dll
 %{_libdir}/wine/%{winepedir}/wpcap.dll
 %{_libdir}/wine/%{winesodir}/wpcap.so
@@ -1822,12 +1817,10 @@ fi
 %{_libdir}/wine/%{winepedir}/x3daudio1_5.dll
 %{_libdir}/wine/%{winepedir}/x3daudio1_6.dll
 %{_libdir}/wine/%{winepedir}/x3daudio1_7.dll
-%if 0%{?wine_staging}
 %{_libdir}/wine/%{winepedir}/xactengine2_0.dll
 %{_libdir}/wine/%{winepedir}/xactengine2_4.dll
 %{_libdir}/wine/%{winepedir}/xactengine2_7.dll
 %{_libdir}/wine/%{winepedir}/xactengine2_9.dll
-%endif
 %{_libdir}/wine/%{winepedir}/xactengine3_0.dll
 %{_libdir}/wine/%{winepedir}/xactengine3_1.dll
 %{_libdir}/wine/%{winepedir}/xactengine3_2.dll