diff --git a/java/com/tigervnc/vncviewer/BIPixelBuffer.java b/java/com/tigervnc/vncviewer/BIPixelBuffer.java
index 692b712..d5ec7b6 100644
--- a/java/com/tigervnc/vncviewer/BIPixelBuffer.java
+++ b/java/com/tigervnc/vncviewer/BIPixelBuffer.java
@@ -24,12 +24,25 @@
 import com.tigervnc.rfb.*;
 import com.tigervnc.rfb.Exception;
 
-public class BIPixelBuffer extends PlatformPixelBuffer
+public class BIPixelBuffer extends PlatformPixelBuffer implements ImageObserver
 {
   public BIPixelBuffer(int w, int h, CConn cc_, DesktopWindow desktop_) {
     super(w, h, cc_, desktop_);
+    clip = new Rectangle();
   }
 
+  public void setPF(PixelFormat pf) {
+    super.setPF(pf);
+    if (source != null)
+      source.newPixels(data, cm, 0, width_);
+  }
+
+  public void updateColourMap() {
+    cm = new IndexColorModel(8, nColours, reds, greens, blues);
+    if (source != null)
+      source.newPixels(data, cm, 0, width_);
+  }
+  
   // resize() resizes the image, preserving the image data where possible.
   public void resize(int w, int h) {
     if (w == width() && h == height()) return;
@@ -43,6 +56,12 @@
     image = gc.createCompatibleImage(w, h, Transparency.TRANSLUCENT);
     image.setAccelerationPriority(1);
     image.createGraphics();
+    data = new int[width() * height()];
+    source = new MemoryImageSource(w, h, cm, data, 0, w);
+    source.setAnimated(true);
+    source.setFullBufferUpdates(false);
+    source.newPixels(data, cm, 0, width_);
+    sourceImage = tk.createImage(source);
   }
 
   public void fillRect(int x, int y, int w, int h, int pix) {
@@ -63,29 +82,29 @@
   }
 
   public void imageRect(int x, int y, int w, int h, Object pix) {
-    Graphics2D graphics = (Graphics2D)image.getGraphics();
-    Image img;
     if (pix instanceof Image) {
-      img = (Image)pix;
-    } else {
-      img = tk.createImage(new MemoryImageSource(w, h, cm, (int[])pix, 0, w));
-      img.setAccelerationPriority(1);
-    }
-    boolean ret = tk.prepareImage(img, -1, -1, null);
-    if (!ret) {
-      while ((tk.checkImage(img, -1, -1, null) & ImageObserver.ALLBITS) == 0) {
-        synchronized (this) {
-          try {
-            this.wait(0, 10000);
-          } catch (InterruptedException e) {
-            throw new Exception("Error decoding JPEG data");
-          }
+      Image img = (Image)pix;
+      clip = new Rectangle(x, y, w, h); 
+      synchronized(clip) {
+        tk.prepareImage(img, -1, -1, this);
+        try {
+          clip.wait(1000);
+        } catch (InterruptedException e) {
+          throw new Exception("Error decoding JPEG data");
         }
-      }
-    } 
-    graphics.drawImage(img, x, y, w, h, null); 
-    graphics.dispose();
-    img.flush();
+      } 
+      clip = null;
+      img.flush();
+    } else {
+      for (int j = 0; j < h; j++)
+        System.arraycopy(pix, (w*j), data, width_ * (y + j) + x, w);
+      source.newPixels(x, y, w, h, true);
+      Graphics2D graphics = (Graphics2D)image.getGraphics();
+      graphics.setClip(x, y, w, h);
+      graphics.drawImage(sourceImage, 0, 0, null);
+      graphics.setClip(0, 0, width(), height());
+      graphics.dispose();
+    }
   }
 
   public void copyRect(int x, int y, int w, int h, int srcX, int srcY) {
@@ -98,7 +117,29 @@
     return (Image)image;
   }
 
+  public boolean imageUpdate(Image img, int infoflags, int x, int y, int w, int h) {
+    if ((infoflags & (ALLBITS | ABORT)) == 0) {
+      return true;
+    } else {
+      if ((infoflags & ALLBITS) != 0) {
+        if (clip != null) {
+          synchronized(clip) {
+            Graphics2D graphics = (Graphics2D)image.getGraphics();
+            graphics.drawImage(img, clip.x, clip.y, clip.width, clip.height, null); 
+            graphics.dispose();
+            clip.notify();
+          }
+        }
+      }
+      return false;
+    }
+  }
+
   BufferedImage image;
+  MemoryImageSource source;
+  int[] data;
+  Image sourceImage;
+  Rectangle clip;
 
   static LogWriter vlog = new LogWriter("BIPixelBuffer");
 }