diff --git a/glib-i386-atomic.patch b/glib-i386-atomic.patch
new file mode 100644
index 0000000..01495c0
--- /dev/null
+++ b/glib-i386-atomic.patch
@@ -0,0 +1,15 @@
+diff -up glib-2.16.6/configure.atomic glib-2.16.6/configure
+--- glib-2.16.6/configure.atomic	2008-10-27 18:24:20.000000000 -0400
++++ glib-2.16.6/configure	2008-10-27 18:24:31.000000000 -0400
+@@ -42742,11 +42742,6 @@ $as_echo_n "checking whether to use asse
+ 
+ if test x"$GCC" = xyes; then
+   case $host_cpu in
+-    i386)
+-      { $as_echo "$as_me:$LINENO: result: none" >&5
+-$as_echo "none" >&6; }
+-      glib_memory_barrier_needed=no
+-      ;;
+     i?86)
+       { $as_echo "$as_me:$LINENO: result: i486" >&5
+ $as_echo "i486" >&6; }
diff --git a/glib2.spec b/glib2.spec
index ed0587b..fe9f1a9 100644
--- a/glib2.spec
+++ b/glib2.spec
@@ -3,7 +3,7 @@
 Summary: A library of handy utility functions
 Name: glib2
 Version: 2.18.2
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: LGPLv2+
 Group: System Environment/Libraries
 URL: http://www.gtk.org
@@ -25,6 +25,8 @@ Patch2: gio-2.18-always-pass-fuse-file-uri.patch
 # http://bugzilla.gnome.org/show_bug.cgi?id=528320 (from svn)
 Patch3: glib-2.18.2-no-generic-icons.patch
 
+Patch4: glib-i386-atomic.patch
+
 # this patch requires autoreconf
 BuildRequires: autoconf automake libtool gettext-devel gtk-doc
 
@@ -61,6 +63,7 @@ of version 2 of the GLib library.
 %setup -q -n glib-%{version}
 %patch2 -p1 -b .always-pass-fuse-file-uri
 %patch3 -p0 -b .no-generic-icons
+%patch4 -p1 -b .i386-atomic
 
 autoreconf
 
@@ -137,6 +140,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/lib*.a
 
 %changelog
+* Mon Oct 27 2008 Matthias Clasen <mclasen@redhat.com> - 2.18.2-3
+- Use asm implementation for atomic ops on x86
+
 * Fri Oct 24 2008 Alexander Larsson <alexl@redhat.com> - 2.18.2-2
 - Don't return generic fallback icons for files,
   as this means custom mimetypes don't work (from svn)