diff --git a/glamor/glamor_core.c b/glamor/glamor_core.c
index 5ecc894bb..ed6663e5c 100644
--- a/glamor/glamor_core.c
+++ b/glamor/glamor_core.c
@@ -218,6 +218,9 @@ glamor_set_spans(DrawablePtr drawable, GCPtr gc, char *src,
     int i;
 
     switch (drawable->depth) {
+    case 8:
+	format = GL_ALPHA;
+	type = GL_UNSIGNED_BYTE;
     case 24:
     case 32:
 	format = GL_BGRA;
diff --git a/glamor/glamor_getspans.c b/glamor/glamor_getspans.c
index 5853f9450..9a7066cb9 100644
--- a/glamor/glamor_getspans.c
+++ b/glamor/glamor_getspans.c
@@ -63,6 +63,9 @@ glamor_get_spans(DrawablePtr drawable,
 	type = GL_UNSIGNED_BYTE;
 	readpixels_dst = temp_dst;
 	break;
+    case 8:
+	format = GL_ALPHA;
+	type = GL_UNSIGNED_BYTE;
     case 24:
 	format = GL_RGB;
 	type = GL_UNSIGNED_BYTE;