diff --git a/glibc.changes b/glibc.changes
index 4d55a4e..eb0d1c0 100644
--- a/glibc.changes
+++ b/glibc.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Tue Jun 28 12:30:34 UTC 2011 - aj@suse.de
+
+- Only apply glibc-2.10.99-ia64-include.diff on SLE but not on
+  openSUSE.
+
 -------------------------------------------------------------------
 Mon Jun 27 12:19:47 UTC 2011 - aj@suse.de
 
diff --git a/glibc.spec b/glibc.spec
index ad28485..b48e68a 100644
--- a/glibc.spec
+++ b/glibc.spec
@@ -79,7 +79,7 @@ Obsoletes:      glibc-64bit
 Obsoletes:      glibc-32bit
 %endif
 Version:        2.13
-Release:        15
+Release:        5
 Url:            http://www.gnu.org/software/libc/libc.html
 Source:         glibc-%{version}-996cf2ef0727.tar.bz2
 Source2:        http://ftp.gnu.org/gnu/glibc/glibc-ports-2.13.tar.bz2
@@ -165,7 +165,7 @@ Patch39:        glibc-2.10.99-ia64-include.diff
 Patch40:        libm-x86-64-exceptions.diff
 # PATCH-MISSING-TAG -- See http://en.opensuse.org/openSUSE:Packaging_Patches_guidelines
 Patch41:        glibc-uio-cell.diff
-# PATCH-MISSING-TAG -- See http://en.opensuse.org/openSUSE:Packaging_Patches_guidelines
+# PATCH-FIX-SLE -- Do not assume statfs64 exists for ia64's ia32 layer bnc#534828
 Patch42:        glibc-statfs64-ia64.diff
 # PATCH-MISSING-TAG -- See http://en.opensuse.org/openSUSE:Packaging_Patches_guidelines
 Patch43:        missing-include-build-fix.diff
@@ -214,6 +214,7 @@ Patch502:       ARM_glibc-2.10.1-local-lowlevellock.diff
 # PATCH-MISSING-TAG -- See http://en.opensuse.org/openSUSE:Packaging_Patches_guidelines
 Patch503:       ARM_glibc-2.10.1-local-no-hwcap.diff
 
+
 %description
 The GNU C Library provides the most important standard libraries used
 by nearly all programs: the standard C library, the standard math
@@ -227,6 +228,7 @@ Group:          Documentation/Other
 Requires(post): %{install_info_prereq}
 Requires(postun): %{install_info_prereq}
 
+
 %description info
 This package contains the documentation for the GNU C library stored as
 info files. Due to a lack of resources, this documentation is not
@@ -237,6 +239,7 @@ License:        GPLv2+ ; LGPLv2.1+
 Summary:        HTML Documentation for the GNU C Library
 Group:          Documentation/HTML
 
+
 %description html
 This package contains the HTML documentation for the GNU C library. Due
 to a lack of resources, this documentation is not complete and is
@@ -247,6 +250,7 @@ License:        LGPLv2.1+
 Summary:        Database Sources for 'locale'
 Group:          System/Libraries
 
+
 %description i18ndata
 This package contains the data needed to build the locale data files to
 use the internationalization features of the GNU libc. It is normally
@@ -267,6 +271,7 @@ Obsoletes:      glibc-locale-64bit
 Obsoletes:      glibc-locale-32bit
 %endif
 
+
 %description locale
 Locale data for the internationalisation features of the GNU C library.
 
@@ -280,6 +285,7 @@ Requires(preun): %insserv_prereq
 Requires(post): %insserv_prereq
 Requires(postun): %insserv_prereq
 
+
 %description -n nscd
 Nscd caches name service lookups and can dramatically improve
 performance with NIS, NIS+, and LDAP.
@@ -297,6 +303,7 @@ Obsoletes:      glibc-profile-64bit
 Obsoletes:      glibc-profile-32bit
 %endif
 
+
 %description profile
 This package contains special versions of the GNU C library which are
 necessary for profiling and debugging.
@@ -317,17 +324,18 @@ Obsoletes:      glibc-devel-32bit
 Requires:       glibc = %{version}
 Requires:       linux-kernel-headers
 
+
 %description devel
 These libraries are needed to develop programs which use the standard C
 library.
 
 %package devel-static
 
-
 Summary:        C library static libraries for -static linking
 Group:          Development/Libraries/C and C++
 Requires:       %{name}-devel = %{version}
 
+
 %description devel-static
 The glibc-devel-static package contains the C library static libraries
 for -static linking.  You don't need these, unless you link statically,
@@ -339,6 +347,7 @@ Summary:        Development utilities from GNU C library
 Group:          Development/Languages/C and C++
 Requires:       glibc = %{version}
 
+
 %description utils
 The glibc-utils package contains mtrace, a memory leak tracer and
 xtrace, a function call tracer which can be helpful during program
@@ -348,12 +357,14 @@ If you are unsure if you need this, don't install this package.
 
 %ifarch %ix86
 
+
 %package obsolete
 License:        BSD3c(or similar) ; GPLv2+ ; LGPLv2.1+
 Summary:        Obsolete Shared Libraries from the GNU C Library
 Group:          System/Libraries
 Requires:       glibc = %{version}
 
+
 %description obsolete
 This package provides some old libraries from the GNU C Library which
 are no longer supported. Additional it provides a compatibility library
@@ -366,6 +377,7 @@ versions of your software.
 
 %endif
 
+
 %prep
 %ifarch %arm armv5tel armv7l
 # add glibc-ports for arm
@@ -416,7 +428,10 @@ rm nscd/s-stamp
 %patch39
 %patch40
 %patch41 -p1
+%if 0%{?sles_version}
+# Only apply for x86 on SLES
 %patch42
+%endif
 %patch43 -p1
 %patch44 -p1
 %patch45
@@ -470,6 +485,7 @@ find . -name configure | xargs touch
 ###
 #######################################################################
 
+
 %build
 if [ -x /bin/uname.bin ]; then
 	/bin/uname.bin -a
@@ -645,6 +661,7 @@ $BuildCC -static %{optflags} -Os $RPM_SOURCE_DIR/glibc_post_upgrade.c -o glibc_p
 ###
 #######################################################################
 
+
 %check
 %if %{run_testsuite}
 	# Increase timeout
@@ -667,6 +684,7 @@ make -C cc-base check-abi || echo check-abi failed
 ###
 #######################################################################
 
+
 %install
 # We don't want to strip the .symtab from our libraries in find-debuginfo.sh,
 # certainly not from libpthread.so.* because it is used by libthread_db to find
@@ -842,6 +860,7 @@ done
 ###
 #######################################################################
 
+
 %clean
 rm -rf %{buildroot}
 
@@ -849,10 +868,13 @@ rm -rf %{buildroot}
 # %%set_permissions %%{_libdir}/pt_chown
 # since we cannot do it in our own post section
 
+
 %post -p %{_sbindir}/glibc_post_upgrade
 
+
 %postun -p /sbin/ldconfig
 
+
 %post locale
 for l in /usr/share/locale/locale.alias %{_libdir}/gconv/gconv-modules; do
 	[ -d "$l.d" ] || continue
@@ -861,19 +883,24 @@ for l in /usr/share/locale/locale.alias %{_libdir}/gconv/gconv-modules; do
 done
 /usr/sbin/iconvconfig
 
+
 %post info
 %install_info --info-dir=%{_infodir} %{_infodir}/libc.info.gz
 
+
 %postun info
 %install_info_delete --info-dir=%{_infodir} %{_infodir}/libc.info.gz
 
+
 %preun -n nscd
 %stop_on_removal nscd
 
+
 %post -n nscd
 %{insserv_force_if_yast nscd}
 mkdir -p /var/run/nscd
 
+
 %postun -n nscd
 %restart_on_update nscd
 %insserv_cleanup
@@ -890,6 +917,7 @@ exit 0
 
 # glibc
 
+
 %files
 %defattr(-,root,root)
 %doc LICENSES
@@ -1017,6 +1045,7 @@ exit 0
 
 %ifarch %ix86
 
+
 %files obsolete
 %defattr (755,root,root,755)
 %dir /%{_lib}/obsolete/
@@ -1025,6 +1054,7 @@ exit 0
 	/%{_lib}/obsolete/noversion/libNoVersion.so.1
 %endif
 
+
 %files locale -f libc.lang
 %defattr(-,root,root)
 %{_datadir}/locale/locale.alias
@@ -1033,6 +1063,7 @@ exit 0
 %endif
 %{_libdir}/gconv
 
+
 %files devel
 %defattr(-,root,root)
 %doc COPYING COPYING.LIB FAQ INSTALL NEWS NOTES README BUGS CONFORMANCE
@@ -1059,6 +1090,7 @@ exit 0
 %{_libdir}/libpthread_nonshared.a
 %{_libdir}/librpcsvc.a
 
+
 %files devel-static
 %defattr(-,root,root)
 %{_libdir}/libBrokenLocale.a
@@ -1073,20 +1105,24 @@ exit 0
 %{_libdir}/librt.a
 %{_libdir}/libutil.a
 
+
 %files info
 %defattr(-,root,root)
 %doc %{_infodir}/libc.info.gz
 %doc %{_infodir}/libc.info-?.gz
 %doc %{_infodir}/libc.info-??.gz
 
+
 %files html
 %defattr(-,root,root)
 %doc %{_prefix}/share/doc/glibc
 
+
 %files i18ndata
 %defattr(-,root,root)
 %{_prefix}/share/i18n
 
+
 %files -n nscd
 %defattr(-,root,root)
 %config(noreplace) /etc/nscd.conf
@@ -1102,6 +1138,7 @@ exit 0
 %attr(0600,root,root) %verify(not md5 size mtime) %ghost %config(missingok,noreplace) /var/run/nscd/group
 %attr(0600,root,root) %verify(not md5 size mtime) %ghost %config(missingok,noreplace) /var/run/nscd/hosts
 
+
 %files profile
 %defattr(-,root,root)
 %{_libdir}/libc_p.a
@@ -1117,6 +1154,7 @@ exit 0
 %{_libdir}/libutil_p.a
 %{_libdir}/libdl_p.a
 
+
 %files utils
 %defattr(-,root,root)
 /%{_lib}/libmemusage.so
@@ -1128,4 +1166,6 @@ exit 0
 %{_bindir}/pcprofiledump
 %{_bindir}/xtrace
 
+
+
 %changelog