diff --git a/ChangeLog b/ChangeLog
index 03acbb0da7..44b6ce43be 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2008-07-14  Edward Hervey  <edward.hervey@collabora.co.uk>
+
+	* gst/deinterlace2/tvtime/greedy.c:
+	(gst_deinterlace_method_greedy_l_class_init):
+	* gst/deinterlace2/tvtime/greedyh.c:
+	(gst_deinterlace_method_greedy_h_class_init):
+	* gst/deinterlace2/tvtime/vfir.c:
+	(gst_deinterlace_method_vfir_class_init):
+	Fix build on x86_64
+
 2008-07-14  Jan Schmidt  <thaytan@noraisin.net>
 
 	* ext/resindvd/gstmpegdemux.c:
diff --git a/gst/deinterlace2/tvtime/greedy.c b/gst/deinterlace2/tvtime/greedy.c
index 434c332fca..9e398e75c2 100644
--- a/gst/deinterlace2/tvtime/greedy.c
+++ b/gst/deinterlace2/tvtime/greedy.c
@@ -449,7 +449,9 @@ gst_deinterlace_method_greedy_l_class_init (GstDeinterlaceMethodGreedyLClass *
 {
   GstDeinterlaceMethodClass *dim_class = (GstDeinterlaceMethodClass *) klass;
   GObjectClass *gobject_class = (GObjectClass *) klass;
+#ifdef HAVE_CPU_I386
   guint cpu_flags = oil_cpu_get_flags ();
+#endif
 
   gobject_class->set_property = gst_deinterlace_method_greedy_l_set_property;
   gobject_class->get_property = gst_deinterlace_method_greedy_l_get_property;
diff --git a/gst/deinterlace2/tvtime/greedyh.c b/gst/deinterlace2/tvtime/greedyh.c
index 7f26e0483c..037c4dfc8f 100644
--- a/gst/deinterlace2/tvtime/greedyh.c
+++ b/gst/deinterlace2/tvtime/greedyh.c
@@ -363,7 +363,9 @@ gst_deinterlace_method_greedy_h_class_init (GstDeinterlaceMethodGreedyHClass *
 {
   GstDeinterlaceMethodClass *dim_class = (GstDeinterlaceMethodClass *) klass;
   GObjectClass *gobject_class = (GObjectClass *) klass;
+#ifdef HAVE_CPU_I386
   guint cpu_flags = oil_cpu_get_flags ();
+#endif
 
   gobject_class->set_property = gst_deinterlace_method_greedy_h_set_property;
   gobject_class->get_property = gst_deinterlace_method_greedy_h_get_property;
diff --git a/gst/deinterlace2/tvtime/vfir.c b/gst/deinterlace2/tvtime/vfir.c
index fcfbaa6b39..0f46e6f492 100644
--- a/gst/deinterlace2/tvtime/vfir.c
+++ b/gst/deinterlace2/tvtime/vfir.c
@@ -207,7 +207,9 @@ static void
 gst_deinterlace_method_vfir_class_init (GstDeinterlaceMethodVFIRClass * klass)
 {
   GstDeinterlaceMethodClass *dim_class = (GstDeinterlaceMethodClass *) klass;
+#ifdef HAVE_CPU_I386
   guint cpu_flags = oil_cpu_get_flags ();
+#endif
 
   dim_class->fields_required = 2;
   dim_class->deinterlace_frame = deinterlace_frame_vfir;