diff --git a/haproxy-3.0.5.tar.gz b/haproxy-3.0.7.tar.gz
similarity index 39%
rename from haproxy-3.0.5.tar.gz
rename to haproxy-3.0.7.tar.gz
index cae2558c255b08c2d768db7399599bcdd278c455..ab70bba664e958103ad616971381cbcbfc715efe 100644
Binary files a/haproxy-3.0.5.tar.gz and b/haproxy-3.0.7.tar.gz differ
diff --git a/haproxy.spec b/haproxy.spec
index 2d8eed6dc28955eedebd6a611817f34c1eac6ac0..f4169a533cb156ecfbd4e0707d488e68e962afc3 100644
--- a/haproxy.spec
+++ b/haproxy.spec
@@ -4,13 +4,13 @@
 %global _hardened_build   1
 
 Name:             haproxy
-Version:          3.0.5
+Version:          3.0.7
 Release:          1
 Summary:          The Reliable, High Performance TCP/HTTP Load Balancer
 
-License:          GPLv2+
+License:          GPL-2.0-or-later
 URL:              https://www.haproxy.org/
-Source0:          https://www.haproxy.org/download/2.9/src/%{name}-%{version}.tar.gz
+Source0:          https://www.haproxy.org/download/3.0/src/%{name}-%{version}.tar.gz
 Source1:          %{name}.service
 Source2:          %{name}.cfg
 Source3:          %{name}.logrotate
@@ -30,18 +30,14 @@ web sites and powers quite a number of the world's most visited ones.
 %autosetup -n %{name}-%{version} -p1
 
 %build
-%if "%toolchain" == "clang"
-	%global make_opts CC=clang 
-%endif
-
-%make_build %{?make_opts} CPU="generic" TARGET="linux-glibc" USE_OPENSSL=1 USE_PCRE2=1 USE_SLZ=1 \
+%make_build CC="%{__cc}" CXX="%{__cxx}" CPU="generic" TARGET="linux-glibc" USE_OPENSSL=1 USE_PCRE2=1 USE_SLZ=1 \
     USE_LUA=1 USE_CRYPT_H=1 USE_SYSTEMD=1 USE_LINUX_TPROXY=1 USE_GETADDRINFO=1 USE_PROMEX=1 DEFINE=-DMAX_SESS_STKCTR=12 \
-    ADDINC="%{build_cflags}" ADDLIB="%{build_ldflags}"
+    CFLAGS="%{build_cflags}" ARCH_FLAGS="%{build_cflags}" LDFLAGS="%{build_ldflags}"
 
-%make_build %{?make_opts} admin/halog/halog ADDINC="%{build_cflags}" ADDLIB="%{build_ldflags}"
+%make_build CC="%{__cc}" CXX="%{__cxx}" admin/halog/halog ARCH_FLAGS="%{build_cflags}" LDFLAGS="%{build_ldflags}"
 
 pushd admin/iprange
-%make_build %{?make_opts} OPTIMIZE="%{build_cflags}" LDFLAGS="%{build_ldflags}"
+%make_build CC="%{__cc}" OPTIMIZE="%{build_cflags}" LDFLAGS="%{build_ldflags}"
 popd
 
 %install
@@ -98,7 +94,6 @@ exit 0
 %systemd_postun_with_restart %{name}.service
 
 %files
-%defattr(-,root,root)
 %license LICENSE
 %dir %{_sysconfdir}/haproxy
 %config(noreplace) %{_sysconfdir}/haproxy/%{name}.cfg
@@ -115,11 +110,13 @@ exit 0
 %{_datadir}/haproxy/*
 
 %files help
-%defattr(-,root,root)
 %doc doc/* examples/* CHANGELOG README VERSION
 %{_mandir}/man1/*
 
 %changelog
+* Thu Jan 02 2025 Funda Wang <fundawang@yeah.net> - 3.0.7-1
+- Update to 3.0.7
+
 * Mon Nov 04 2024 xu_ping <707078654@qq.com> - 3.0.5-1
 - Upgrade version to 3.0.5