diff --git a/ChangeLog b/ChangeLog
index 7efc33a364..3aa9de1a07 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2004-07-30  David Schleef  <ds@schleef.org>
+
+	* gst/gstatomic_impl.h: Enable atomic code for x86_64
+
 2004-07-29  David Schleef  <ds@schleef.org>
 
 	* libs/gst/dataprotocol/dataprotocol-test.c: (conversion_test):
diff --git a/gst/gstatomic_impl.h b/gst/gstatomic_impl.h
index 2fd577d381..45ad8f2cba 100644
--- a/gst/gstatomic_impl.h
+++ b/gst/gstatomic_impl.h
@@ -38,7 +38,7 @@ G_BEGIN_DECLS
 #if defined (GST_CAN_INLINE) || defined (__GST_ATOMIC_C__)
   
 /***** Intel x86 *****/
-#if defined (HAVE_CPU_I386) && defined(__GNUC__)
+#if (defined (HAVE_CPU_I386) || defined (HAVE_CPU_X86_64)) && defined(__GNUC__)
 
 #ifdef GST_CONFIG_NO_SMP
 #define SMP_LOCK ""