diff --git a/win/vncviewer/CConn.cxx b/win/vncviewer/CConn.cxx
index aa4ba75..d5eadc4 100644
--- a/win/vncviewer/CConn.cxx
+++ b/win/vncviewer/CConn.cxx
@@ -511,6 +511,7 @@
     }
     debugRects.clear();
   }
+  window->framebufferUpdateEnd();
 
   if (firstUpdate) {
     int width, height;
diff --git a/win/vncviewer/DesktopWindow.cxx b/win/vncviewer/DesktopWindow.cxx
index c85730a..744149d 100644
--- a/win/vncviewer/DesktopWindow.cxx
+++ b/win/vncviewer/DesktopWindow.cxx
@@ -42,6 +42,7 @@
 const int TIMER_BUMPSCROLL = 1;
 const int TIMER_POINTER_INTERVAL = 2;
 const int TIMER_POINTER_3BUTTON = 3;
+const int TIMER_UPDATE = 4;
 
 
 //
@@ -222,6 +223,10 @@
   bumpScrollTimer.setHWND(handle);
   bumpScrollTimer.setId(TIMER_BUMPSCROLL);
 
+  // Initialise the update timer
+  updateTimer.setHWND(handle);
+  updateTimer.setId(TIMER_UPDATE);
+
   // Hook the clipboard
   clipboard.setNotifier(this);
 
@@ -543,6 +548,9 @@
     case TIMER_POINTER_3BUTTON:
       ptr.handleTimer(callback, wParam);
       break;
+    case TIMER_UPDATE:
+      updateWindow();
+      break;
     }
     break;
 
@@ -871,6 +879,19 @@
 #endif
 }
 
+void DesktopWindow::updateWindow()
+{
+  Rect rect;
+
+  updateTimer.stop();
+
+  rect = damage.get_bounding_rect();
+  damage.clear();
+
+  RECT invalid = {rect.tl.x, rect.tl.y, rect.br.x, rect.br.y};
+  InvalidateRect(frameHandle, &invalid, FALSE);
+}
+
 void
 DesktopWindow::hideLocalCursor() {
   // - Blit the cursor backing store over the cursor
@@ -901,6 +922,9 @@
     renderLocalCursor();
 
     invalidateDesktopRect(cursorBackingRect, false);
+    // Since we render the cursor onto the framebuffer, we need to update
+    // right away to get a responsive cursor.
+    updateWindow();
   }
 }
 
@@ -945,8 +969,9 @@
     rect = desktopToClient(buffer->calculateScaleBoundary(crect));
   } else rect = desktopToClient(crect);
   if (rect.intersect(client_size).is_empty()) return false;
-  RECT invalid = {rect.tl.x, rect.tl.y, rect.br.x, rect.br.y};
-  InvalidateRect(frameHandle, &invalid, FALSE);
+  damage.assign_union(rfb::Region(rect));
+  if (!updateTimer.isActive())
+    updateTimer.start(100);
   return true;
 }
 
@@ -1262,6 +1287,12 @@
 }
 
 
+void DesktopWindow::framebufferUpdateEnd()
+{
+  updateWindow();
+}
+
+
 void
 DesktopWindow::setName(const char* name) {
   if (name != desktopName) {
diff --git a/win/vncviewer/DesktopWindow.h b/win/vncviewer/DesktopWindow.h
index 259b6b0..4bc7b7a 100644
--- a/win/vncviewer/DesktopWindow.h
+++ b/win/vncviewer/DesktopWindow.h
@@ -119,6 +119,9 @@
       // - Set the local clipboard
       void serverCutText(const char* str, rdr::U32 len);
 
+      // - Completion of one FramebufferUpdate
+      void framebufferUpdateEnd();
+
       // - Draw into the desktop buffer & update the window
       void fillRect(const Rect& r, Pixel pix);
       void imageRect(const Rect& r, void* pixels);
@@ -197,6 +200,9 @@
       Point bumpScrollDelta;
       IntervalTimer bumpScrollTimer;
 
+      // Track modified areas of the framebuffer
+      void updateWindow();
+
       // Locally-rendered VNC cursor
       void hideLocalCursor();
       void showLocalCursor();
@@ -235,6 +241,10 @@
       bool fullscreenActive;
       bool fullscreenRestore;
 
+      // Damage tracking
+      rfb::Region damage;
+      IntervalTimer updateTimer;
+
       // Cursor handling
       Cursor cursor;
       bool systemCursorVisible;  // Should system-cursor be drawn?