diff --git a/hercules.spec b/hercules.spec
index a0ef2dc..b4bb469 100644
--- a/hercules.spec
+++ b/hercules.spec
@@ -1,11 +1,12 @@
 Summary: Hercules S/370, ESA/390, and z/Architecture emulator
 Name: hercules
 Version: 3.13
-Release: 21%{?dist}
+Release: 18%{?dist}
 # Automatically converted from old format: QPL - review is highly recommended.
 License: QPL-1.0
 URL: http://www.hercules-390.eu/
 Source0: http://downloads.hercules-390.eu/%{name}-%{version}.tar.gz
+#Source0: https://github.com/rbowler/spinhawk/archive/%{version}.tar.gz
 Source1: hercules.cnf
 Source2: hercules-run
 Source3: README-rpm
@@ -18,11 +19,7 @@ BuildRequires: libcap-devel
 BuildRequires: libtool
 BuildRequires: libtool-ltdl-devel
 BuildRequires: make
-Conflicts: sdl-hercules
-Conflicts: sdl-hercules-data
 
-# https://fedoraproject.org/wiki/Changes/EncourageI686LeafRemoval
-ExcludeArch: %{ix86}
 
 %description
 Hercules is an emulator for the IBM System/370, ESA/390, and z/Architecture
@@ -34,6 +31,7 @@ printer-keyboard, 3270 terminal, and 3287 printer devices.
 
 
 %prep
+#%setup -q -n spinhawk-%{version}
 %setup -q
 
 %patch -P0 -p1 -b .fedora
@@ -54,7 +52,7 @@ rm util/Makefile*
 %build
 %configure \
     --enable-external-gui \
-    --enable-optimization="%{optflags} -std=gnu17"
+    --enable-optimization="%{optflags}"
 
 make %{?_smp_mflags} V=1
 
@@ -91,37 +89,17 @@ rm %{buildroot}%{_libdir}/*.la
 %dir %{_sysconfdir}/hercules/
 %attr(0644, root, root) %config(noreplace) %{_sysconfdir}/hercules/hercules.cnf
 %attr(0644, root, root) %config(noreplace) %{_sysconfdir}/hercules/generic.prm
-%{_bindir}/cckd*
-%{_bindir}/cfba*
-%{_bindir}/ckd*
-%{_bindir}/dasd*
-%{_bindir}/dmap*
-%{_bindir}/fba*
-%{_bindir}/herc*
-%{_bindir}/het*
-%{_bindir}/tape*
+%{_bindir}/*
+%{_sbindir}/*
 %{_datadir}/hercules/
 %dir %{_libdir}/hercules/
 %{_libdir}/hercules/*.so
-%{_libdir}/libherc*.so
-%{_libdir}/libdecNumber.so
-%{_libdir}/libsoftfloat.so
+%{_libdir}/*.so
 %{_mandir}/man?/*
 %dir %{_sharedstatedir}/hercules/
 
 
 %changelog
-* Thu Jul 24 2025 Fedora Release Engineering <releng@fedoraproject.org> - 3.13-21
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild
-
-* Mon Jan 20 2025 Fedora Release Engineering <releng@fedoraproject.org> - 3.13-20
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild
-
-* Wed Jan 01 2025 Davide Cavalca <dcavalca@fedoraproject.org> - 3.13-19
-- Conflict with the sdl-hercules packages
-- Drop old comments that trigger a FTBFS due to macro expansion
-  Fixes: RHBZ#2300839
-
 * Wed Aug 07 2024 Miroslav Suchý <msuchy@redhat.com> - 3.13-18
 - convert license to SPDX