diff --git a/src/i830.h b/src/i830.h
index 4748b815..8b6c5e65 100644
--- a/src/i830.h
+++ b/src/i830.h
@@ -727,6 +727,8 @@ static inline int i830_tiling_supported(I830Ptr pI830)
 
 static inline int i830_fb_compression_supported(I830Ptr pI830)
 {
+    if (!i830_tiling_supported(pI830))
+	return FALSE;
     if (!IS_MOBILE(pI830))
 	return FALSE;
     if (IS_I810(pI830) || IS_I815(pI830) || IS_I830(pI830))
diff --git a/src/i830_driver.c b/src/i830_driver.c
index a380971a..dcbed227 100644
--- a/src/i830_driver.c
+++ b/src/i830_driver.c
@@ -2334,9 +2334,9 @@ I830ScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv)
        pI830->fb_compression = TRUE;
    else
        pI830->fb_compression = FALSE;
-   /* ... but disable if requested */
-   if (!xf86ReturnOptValBool(pI830->Options, OPTION_FBC, TRUE))
-       pI830->fb_compression = FALSE;
+
+   if (xf86ReturnOptValBool(pI830->Options, OPTION_FBC, FALSE))
+       pI830->fb_compression = TRUE;
 
    if (pI830->fb_compression) {
        xf86DrvMsg(pScrn->scrnIndex, X_INFO, "Framebuffer compression enabled, "