diff --git a/glibc-testsuite.spec b/glibc-testsuite.spec
index 5b44a27..6f80d1b 100644
--- a/glibc-testsuite.spec
+++ b/glibc-testsuite.spec
@@ -874,10 +874,14 @@ rm -f %{buildroot}/etc/ld.so.cache
 touch %{buildroot}/etc/ld.so.cache
 
 # libNoVersion belongs only to glibc-obsolete:
+%ifarch %ix86
+rm -f %{buildroot}%{_libdir}/libNoVersion*
 %ifarch i586
-	rm -f %{buildroot}%{_libdir}/libNoVersion*
-	mkdir -p %{buildroot}/%{_lib}/obsolete/noversion
-	mv -v %{buildroot}/%{_lib}/libNoVersion* %{buildroot}/%{_lib}/obsolete/noversion/
+mkdir -p %{buildroot}/%{_lib}/obsolete/noversion
+mv -v %{buildroot}/%{_lib}/libNoVersion* %{buildroot}/%{_lib}/obsolete/noversion/
+%else
+rm -f %{buildroot}/%{_lib}/libNoVersion*
+%endif
 %endif
 
 # Don't look at ldd! We don't wish a /bin/sh requires
diff --git a/glibc-utils.spec b/glibc-utils.spec
index cdf0d78..bf8cfa1 100644
--- a/glibc-utils.spec
+++ b/glibc-utils.spec
@@ -874,10 +874,14 @@ rm -f %{buildroot}/etc/ld.so.cache
 touch %{buildroot}/etc/ld.so.cache
 
 # libNoVersion belongs only to glibc-obsolete:
+%ifarch %ix86
+rm -f %{buildroot}%{_libdir}/libNoVersion*
 %ifarch i586
-	rm -f %{buildroot}%{_libdir}/libNoVersion*
-	mkdir -p %{buildroot}/%{_lib}/obsolete/noversion
-	mv -v %{buildroot}/%{_lib}/libNoVersion* %{buildroot}/%{_lib}/obsolete/noversion/
+mkdir -p %{buildroot}/%{_lib}/obsolete/noversion
+mv -v %{buildroot}/%{_lib}/libNoVersion* %{buildroot}/%{_lib}/obsolete/noversion/
+%else
+rm -f %{buildroot}/%{_lib}/libNoVersion*
+%endif
 %endif
 
 # Don't look at ldd! We don't wish a /bin/sh requires
diff --git a/glibc.spec b/glibc.spec
index ff9b42f..5316094 100644
--- a/glibc.spec
+++ b/glibc.spec
@@ -874,10 +874,14 @@ rm -f %{buildroot}/etc/ld.so.cache
 touch %{buildroot}/etc/ld.so.cache
 
 # libNoVersion belongs only to glibc-obsolete:
+%ifarch %ix86
+rm -f %{buildroot}%{_libdir}/libNoVersion*
 %ifarch i586
-	rm -f %{buildroot}%{_libdir}/libNoVersion*
-	mkdir -p %{buildroot}/%{_lib}/obsolete/noversion
-	mv -v %{buildroot}/%{_lib}/libNoVersion* %{buildroot}/%{_lib}/obsolete/noversion/
+mkdir -p %{buildroot}/%{_lib}/obsolete/noversion
+mv -v %{buildroot}/%{_lib}/libNoVersion* %{buildroot}/%{_lib}/obsolete/noversion/
+%else
+rm -f %{buildroot}/%{_lib}/libNoVersion*
+%endif
 %endif
 
 # Don't look at ldd! We don't wish a /bin/sh requires