diff --git a/src/i830_hwmc.c b/src/i830_hwmc.c
index cd69a58f..e33a15de 100644
--- a/src/i830_hwmc.c
+++ b/src/i830_hwmc.c
@@ -52,6 +52,12 @@ Bool intel_xvmc_probe(ScrnInfoPtr pScrn)
     I830Ptr pI830 = I830PTR(pScrn);
     Bool ret = FALSE;
 
+    /* Disable XvMC on DRI2 for now */
+    if (pI830->directRenderingType == DRI_DRI2) {
+	pI830->XvMCEnabled = FALSE;
+	return FALSE;
+    }
+
     if (!pI830->XvMCEnabled)
 	return FALSE;