diff --git a/SPECS/mosquitto.spec b/SPECS/mosquitto.spec
index f24f5de..4c2d077 100644
--- a/SPECS/mosquitto.spec
+++ b/SPECS/mosquitto.spec
@@ -2,7 +2,7 @@
 
 Name:           mosquitto
 Version:        2.0.18
-Release:        1%{?dist}
+Release:        5%{?dist}
 Summary:        Open Source MQTT v5/v3.1.x Broker
 
 License:        EPL-2.0
@@ -16,10 +16,8 @@ BuildRequires:  libuuid-devel
 BuildRequires:  libwebsockets-devel
 BuildRequires:  make
 BuildRequires:  openssl-devel
+BuildRequires:  openssl-devel-engine
 BuildRequires:  systemd-devel
-%if 0%{?rhel} == 7
-BuildRequires:  tcp_wrappers-libs
-%endif
 %if 0%{?with_tests}
 BuildRequires:  CUnit-devel
 %endif
@@ -54,12 +52,7 @@ sed -i "s|prefix?=/usr/local|prefix?=/usr|" config.mk
 sed -i "s|(INSTALL) -s|(INSTALL)|g" lib/Makefile src/Makefile client/Makefile
 
 %build
-%if 0%{?rhel} == 7
-export CFLAGS="%{optflags} -std=gnu99"
-%else
-export CFLAGS="%{optflags}"
-%endif
-export LDFLAGS="%{optflags} %{__global_ldflags} -Wl,--as-needed"
+export CFLAGS="%{optflags}" LDFLAGS="%{optflags} %{__global_ldflags} -Wl,--as-needed"
 make all %{?_smp_mflags} WITH_WEBSOCKETS=yes WITH_SYSTEMD=yes WITH_SRV=yes
 
 %install
@@ -117,9 +110,21 @@ exit 0
 %{_mandir}/man3/libmosquitto.3.*
 
 %changelog
-* Fri Jul 05 2024 Sergey Cherevko <s.cherevko@msvsphere-os.ru> - 2.0.18-1
+* Sat Sep 28 2024 Fabian Affolter <mail@fabian-affolter.ch> - 2.0.18-4
+- Fix FTBFS (closes rhbz#2300978)
+
+* Thu Jul 18 2024 Fedora Release Engineering <releng@fedoraproject.org> - 2.0.18-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
+
+* Fri Jul 05 2024 Sergey Cherevko <s.cherevko@msvsphere-os.ru> - 2.0.18-3
 - Rebuilt for MSVSphere 9.4
 
+* Thu Jan 25 2024 Fedora Release Engineering <releng@fedoraproject.org> - 2.0.18-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
+
+* Sun Jan 21 2024 Fedora Release Engineering <releng@fedoraproject.org> - 2.0.18-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
+
 * Mon Sep 18 2023 Peter Robinson <pbrobinson@fedoraproject.org> - 2.0.18-1
 - Update to 2.0.18