diff --git a/src/radeon_reg.h b/src/radeon_reg.h
index 9503dde..a5c9835 100644
--- a/src/radeon_reg.h
+++ b/src/radeon_reg.h
@@ -1027,6 +1028,7 @@
 #       define  RADEON_REG_LD_CTL_VBLANK_DURING_LOCK   0x00000002L
 #       define  RADEON_REG_LD_CTL_STALL_GUI_UNTIL_FLIP 0x00000004L
 #       define  RADEON_REG_LD_CTL_LOCK_READBACK        0x00000008L
+#       define  RADEON_REG_LD_CTL_FLIP_READBACK        0x00000010L
 #define RADEON_OV0_SCALE_CNTL               0x0420
 #       define  RADEON_SCALER_HORZ_PICK_NEAREST    0x00000004L
 #       define  RADEON_SCALER_VERT_PICK_NEAREST    0x00000008L
diff --git a/src/radeon_video.c b/src/radeon_video.c
index d4e1f0a..a973a1e 100644
--- a/src/radeon_video.c
+++ b/src/radeon_video.c
@@ -2827,8 +2826,14 @@ RADEONPutImage(
 
    offset = (pPriv->video_offset) + (top * dstPitch);
 
-   if(pPriv->doubleBuffer)
+   if(pPriv->doubleBuffer) {
+	unsigned char *RADEONMMIO = info->MMIO;
+
+	/* Wait for last flip to take effect */
+	while(!(INREG(RADEON_OV0_REG_LOAD_CNTL) & RADEON_REG_LD_CTL_FLIP_READBACK));
+
 	offset += pPriv->currentBuffer * new_size;
+   }
 
    dst_start = info->FB + offset;