diff --git a/src/i830_driver.c b/src/i830_driver.c
index e000d92..b3c6d03 100644
--- a/src/i830_driver.c
+++ b/src/i830_driver.c
@@ -1823,11 +1823,11 @@ SetHWOperatingState(ScrnInfoPtr pScrn)
 
    /* Disable clock gating reported to work incorrectly according to the specs.
     */
-   if (IS_I965GM(pI830)) {
-      OUTREG(RENCLK_GATE_D1, I965_RCC_CLOCK_GATE_DISABLE);
-   } else if (IS_I965G(pI830)) {
-      OUTREG(RENCLK_GATE_D1,
-	     I965_RCC_CLOCK_GATE_DISABLE | I965_ISC_CLOCK_GATE_DISABLE);
+   if (IS_I965G(pI830)) {
+      OUTREG(RENCLK_GATE_D1, I965_RCZ_CLOCK_GATE_DISABLE |
+	     I965_RCC_CLOCK_GATE_DISABLE |
+	     I965_RCPB_CLOCK_GATE_DISABLE |
+	     I965_ISC_CLOCK_GATE_DISABLE);
    } else if (IS_I855(pI830) || IS_I865G(pI830)) {
       OUTREG(RENCLK_GATE_D1, SV_CLOCK_GATE_DISABLE);
    } else if (IS_I830(pI830)) {