diff --git a/src/mesa/drivers/dri/i965/intel_mipmap_tree.c b/src/mesa/drivers/dri/i965/intel_mipmap_tree.c
index 78191d10d30..8548bc88bac 100644
--- a/src/mesa/drivers/dri/i965/intel_mipmap_tree.c
+++ b/src/mesa/drivers/dri/i965/intel_mipmap_tree.c
@@ -128,7 +128,7 @@ int intel_miptree_pitch_align (struct intel_context *intel,
 			       int pitch)
 {
    if (!mt->compressed)
-      pitch = (pitch * mt->cpp + 3) & ~3;
+      pitch = ((pitch * mt->cpp + 3) & ~3) / mt->cpp;
 
    return pitch;
 }