diff --git a/Makefile b/Makefile
index dd6b8c445..056159d04 100644
--- a/Makefile
+++ b/Makefile
@@ -308,7 +308,7 @@ amd64-packages: amd64-centos amd64-ubuntu amd64-debian amd64-fedora amd64-opensu
 amd64-almalinux: almalinux8 almalinux8-clang almalinux8-dbg almalinux9 almalinux9-clang almalinux9-dbg
 amd64-centos: centos7 centos7-dbg centos8 centos8-clang centos8-dbg centos9 centos9-clang centos9-dbg
 amd64-debian: debian10 debian10-dbg debian11 debian11-clang debian11-dbg debian12 debian12-clang debian12-dbg
-amd64-fedora: fedora38 fedora38-clang fedora38-dbg fedora39 fedora39-clang fedora39-dbg fedora40 fedora40-clang fedora40-dbg
+amd64-fedora: fedora38 fedora38-clang fedora38-dbg fedora39 fedora39-clang fedora39-dbg fedora40 fedora40-clang fedora40-dbg fedora41 fedora41-clang fedora41-dbg
 amd64-opensuse: opensuse15 opensuse15-clang opensuse15-dbg
 amd64-ubuntu: ubuntu16 ubuntu16-dbg ubuntu18 ubuntu18-dbg ubuntu20 ubuntu20-clang ubuntu20-dbg ubuntu22 ubuntu22-clang ubuntu22-dbg ubuntu24 ubuntu24-clang ubuntu24-dbg
 
diff --git a/docker-compose.yml b/docker-compose.yml
index 8ba0f7c19..1539461c6 100755
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -178,6 +178,34 @@ services:
       - PKG_RELEASE=dbg-fedora40
       - PROXYSQL_BUILD_TYPE=debug
 
+####################################################################################################
+  fedora41_build:
+    extends:
+      service: _build
+    image: proxysql/packaging:build-fedora41-v2.7.1
+    volumes:
+      - ./docker/images/proxysql/rhel-compliant/rpmmacros/rpmbuild/:/root/rpmbuild/
+      - ./docker/images/proxysql/rhel-compliant/rpmmacros/.rpmmacros:/root/.rpmmacros
+      - ./docker/images/proxysql/rhel-compliant/entrypoint/:/opt/entrypoint/
+      - ./:/opt/proxysql/
+    environment:
+      - PKG_RELEASE=fedora41
+      - PROXYSQL_BUILD_TYPE=clickhouse
+
+  fedora41_clang_build:
+    extends:
+      service: fedora41_build
+    image: proxysql/packaging:build-clang-fedora41-v2.7.1
+    environment:
+      - PKG_RELEASE=fedora41-clang
+
+  fedora41_dbg_build:
+    extends:
+      service: fedora41_build
+    environment:
+      - PKG_RELEASE=dbg-fedora41
+      - PROXYSQL_BUILD_TYPE=debug
+
 ####################################################################################################
 ####################################################################################################
   debian10_build:
diff --git a/src/Makefile b/src/Makefile
index 4a3b1dab4..3b238e036 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -118,11 +118,11 @@ STDCPP := -std=c++$(shell echo $(CPLUSPLUS) | cut -c3-4) -DCXX$(shell echo $(CPL
 ### handle clang issue https://bugs.llvm.org/show_bug.cgi?id=16404
 CLANGFIX :=
 ifeq ($(CXX),clang++)
-  CLANG_VERSION := $(shell clang -dumpversion | tr '.' ' ' | awk '{ printf("%04d.%04d.%04d", $$1, $$2, $$3) }')
-  CLANG_MIN_VER := $(shell echo 14.0 | tr '.' ' ' | awk '{ printf("%04d.%04d.%04d", $$1, $$2, $$3) }')
-ifneq ($(CLANG_MIN_VER),$(firstword $(sort $(CLANG_VERSION) $(CLANG_MIN_VER))))
-  CLANGFIX := --rtlib=compiler-rt --unwindlib=libgcc
-endif
+#    CLANG_VERSION := $(shell clang -dumpversion | tr '.' ' ' | awk '{ printf("%04d.%04d.%04d", $$1, $$2, $$3) }')
+#    CLANG_MIN_VER := $(shell echo 14.0 | tr '.' ' ' | awk '{ printf("%04d.%04d.%04d", $$1, $$2, $$3) }')
+#ifneq ($(CLANG_MIN_VER),$(firstword $(sort $(CLANG_VERSION) $(CLANG_MIN_VER))))
+    CLANGFIX := --rtlib=compiler-rt --unwindlib=libgcc
+#endif
 endif
 
 PSQLCH :=