diff --git a/gcc.spec b/gcc.spec
index 1583f92..a69f456 100644
--- a/gcc.spec
+++ b/gcc.spec
@@ -446,8 +446,9 @@ done
 for info in cpp gcc gfortran ; do
   ln -sf $info-%{gcc_suffix}.info.gz $RPM_BUILD_ROOT%{_infodir}/$info.info.gz
 done
-# Provide the traditional /usr/lib/cpp that only handles C
-%if !0%{?usrmerged}
+# Provide the traditional /lib/cpp (as /usr/lib/cpp on usrmerged systems)
+# that only handles C
+%if 0%{?suse_version} < 1550
 cp $RPM_SOURCE_DIR/cpp $RPM_BUILD_ROOT/lib/
 chmod 755 $RPM_BUILD_ROOT/lib/cpp
 %else
@@ -506,7 +507,7 @@ fi
 
 %files -n cpp
 %defattr(-,root,root)
-%if !0%{?usrmerged}
+%if 0%{?suse_version} < 1550
 /lib/cpp
 %else
 %{_prefix}/lib/cpp