diff --git a/src/i830_driver.c b/src/i830_driver.c
index f24d1add..b617bd4a 100644
--- a/src/i830_driver.c
+++ b/src/i830_driver.c
@@ -2722,7 +2722,10 @@ I830ScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv)
    }
 
 #ifdef XvMCExtension
-   if (pI830->XvEnabled && (pI830->directRenderingEnabled) && IS_I9XX(pI830)) {
+   if (pI830->XvEnabled && (pI830->directRenderingEnabled) && 
+       (IS_I915G(pI830) || IS_I915GM(pI830) || 
+        IS_I945G(pI830) || IS_I945GM(pI830) ||
+        IS_G33CLASS(pI830))) {
        I915InitMC(pScreen);
    }
 #endif
diff --git a/src/i830_video.c b/src/i830_video.c
index a74634fa..4ee9f761 100644
--- a/src/i830_video.c
+++ b/src/i830_video.c
@@ -605,8 +605,11 @@ I830InitVideo(ScreenPtr pScreen)
 
 #ifdef XF86DRI
 #ifdef XvMCExtension
-            if (IS_I9XX(pI830))
+        if (IS_I915G(pI830) || IS_I915GM(pI830) || 
+            IS_I945G(pI830) || IS_I945GM(pI830) ||
+            IS_G33CLASS(pI830)) {
                I915XvMCInitXv(pScrn, texturedAdaptor);
+        }
 #endif
 #endif
 	} else {