diff --git a/Judy.spec b/Judy.spec
index c6a5f2c..75ff1f6 100644
--- a/Judy.spec
+++ b/Judy.spec
@@ -1,6 +1,6 @@
 Name:		Judy
 Version:	1.0.5
-Release:	22%{?dist}
+Release:	23%{?dist}
 Summary:	General purpose dynamic array
 License:	LGPLv2+
 URL:		http://sourceforge.net/projects/judy/
@@ -52,7 +52,11 @@ cp -p %{SOURCE1} .
 
 %build
 %set_build_flags
-export CFLAGS="$CFLAGS -fno-strict-aliasing -fno-tree-ccp -fno-tree-dominator-opts -fno-tree-copy-prop -fno-tree-vrp"
+case "%{__cc}" in
+gcc)	COMPILER_SPECIFIC_FLAGS="-fno-strict-aliasing -fno-tree-ccp -fno-tree-dominator-opts -fno-tree-copy-prop -fno-tree-vrp";;
+*)	COMPILER_SPECIFIC_FLAGS="-fno-strict-aliasing";;
+esac
+export CFLAGS="%{optflags} $COMPILER_SPECIFIC_FLAGS"
 %configure --disable-static
 make
 #%{?_smp_mflags}
@@ -77,7 +81,8 @@ cd -
 %files
 %license COPYING README.Fedora
 %doc AUTHORS ChangeLog README examples/
-%{_libdir}/libJudy.so.*
+%{_libdir}/libJudy.so.1
+%{_libdir}/libJudy.so.1.*
 
 %files devel
 %doc doc
@@ -86,6 +91,11 @@ cd -
 %{_mandir}/man3/J*.3*
 
 %changelog
+* Wed Mar 25 2020 Paul Howarth <paul@city-fan.org> - 1.0.5-23
+- Don't pass gcc-only compiler flags to other compilers, e.g. clang
+  (based on https://src.fedoraproject.org/rpms/Judy/pull-request/3 from
+  Timm Baeder)
+
 * Tue Jan 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.5-22
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild