diff --git a/gcc.spec.in b/gcc.spec.in
index 1e56511..3200423 100644
--- a/gcc.spec.in
+++ b/gcc.spec.in
@@ -1891,17 +1891,21 @@ rm -f %{buildroot}/%{libsubdir}/include-fixed/sys/ucontext.h
 rm -f %{buildroot}/%{libsubdir}/include-fixed/bits/statx.h
 rm -f %{buildroot}/%{libsubdir}/include-fixed/pthread.h
 rm -f %{buildroot}/%{libsubdir}/include-fixed/sys/rseq.h
+echo > ../floatn-fixes.list
 # Whether floatn.h is fixed depends on the glibc version and architecture.
 # For now keep it if it's there but in the end we want to fix glibc itself
 # everywhere.
 if test -f %{buildroot}/%{libsubdir}/include-fixed/bits/floatn.h; then
-  cat > ../floatn-fixes.list <<EOF
+  cat >> ../floatn-fixes.list <<EOF
 %dir %{libsubdir}/include-fixed/bits
-%{libsubdir}/include-fixed/bits/floatn-common.h
 %{libsubdir}/include-fixed/bits/floatn.h
 EOF
-else
-  echo > ../floatn-fixes.list
+fi
+if test -f %{buildroot}/%{libsubdir}/include-fixed/bits/floatn-common.h; then
+  cat >> ../floatn-fixes.list <<EOF
+%dir %{libsubdir}/include-fixed/bits
+%{libsubdir}/include-fixed/bits/floatn-common.h
+EOF
 fi
 
 %if !%{enable_plugins}
diff --git a/gcc13.changes b/gcc13.changes
index b92fed0..d26962a 100644
--- a/gcc13.changes
+++ b/gcc13.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Mon Dec 19 14:59:32 UTC 2022 - Dirk Müller <dmueller@suse.com>
+
+- update floatn fixinclude pickup to check each header separately (bsc#1206480)
+
 -------------------------------------------------------------------
 Wed Dec 14 07:52:36 UTC 2022 - Richard Biener <rguenther@suse.com>
 
diff --git a/gcc13.spec b/gcc13.spec
index 5b5bc1d..c7bd2cc 100644
--- a/gcc13.spec
+++ b/gcc13.spec
@@ -2698,17 +2698,21 @@ rm -f %{buildroot}/%{libsubdir}/include-fixed/sys/ucontext.h
 rm -f %{buildroot}/%{libsubdir}/include-fixed/bits/statx.h
 rm -f %{buildroot}/%{libsubdir}/include-fixed/pthread.h
 rm -f %{buildroot}/%{libsubdir}/include-fixed/sys/rseq.h
+echo > ../floatn-fixes.list
 # Whether floatn.h is fixed depends on the glibc version and architecture.
 # For now keep it if it's there but in the end we want to fix glibc itself
 # everywhere.
 if test -f %{buildroot}/%{libsubdir}/include-fixed/bits/floatn.h; then
-  cat > ../floatn-fixes.list <<EOF
+  cat >> ../floatn-fixes.list <<EOF
 %dir %{libsubdir}/include-fixed/bits
-%{libsubdir}/include-fixed/bits/floatn-common.h
 %{libsubdir}/include-fixed/bits/floatn.h
 EOF
-else
-  echo > ../floatn-fixes.list
+fi
+if test -f %{buildroot}/%{libsubdir}/include-fixed/bits/floatn-common.h; then
+  cat >> ../floatn-fixes.list <<EOF
+%dir %{libsubdir}/include-fixed/bits
+%{libsubdir}/include-fixed/bits/floatn-common.h
+EOF
 fi
 
 %if !%{enable_plugins}