diff --git a/ChangeLog b/ChangeLog
index 600fc81..ec66a4b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2933,3 +2933,10 @@ Mon Dec 20 18:51:10 PST 1999	Michael Jennings <mej@eterm.org>
 	bugs in there?! =P
 	
 -------------------------------------------------------------------------------
+Mon Dec 20 19:38:40 PST 1999	Michael Jennings <mej@eterm.org>
+
+	I fixed a bunch of double-buffering stuff here.  I'm going to use it
+	by default on my own Eterms for awhile, and if I don't hit any snags,
+	I'll make it the default in the themes.
+	
+-------------------------------------------------------------------------------
diff --git a/src/events.c b/src/events.c
index 66ca15c..8be0775 100644
--- a/src/events.c
+++ b/src/events.c
@@ -442,11 +442,6 @@ handle_configure_notify(event_t * ev)
       font_chg--;
     }
     if ((width != (unsigned int) szHint.width) || (height != (unsigned int) szHint.height)) {
-      Window win;
-      int unused;
-
-      XGetGeometry(Xdisplay, TermWin.parent, &win, &unused, &unused, &width, &height, &unused, &unused);
-      D_EVENTS((" -> XGetGeometry says I'm %ldx%ld\n", width, height));
       /* We were resized externally.  Handle the resize. */
       D_EVENTS((" -> External resize detected.\n"));
       handle_resize(width, height);
diff --git a/src/windows.c b/src/windows.c
index 11af3dd..b884164 100644
--- a/src/windows.c
+++ b/src/windows.c
@@ -525,6 +525,9 @@ parent_resize(void)
   D_X11((" -> New parent width/height == %lux%lu\n", szHint.width, szHint.height));
   term_resize(szHint.width, szHint.height);
   scrollbar_resize(szHint.width, szHint.height);
+  if (buffer_pixmap != None) {
+    scr_touch();
+  }
 }
 
 void
@@ -552,6 +555,9 @@ handle_resize(unsigned int width, unsigned int height)
     D_X11((" -> New szHint.width/height == %lux%lu\n", szHint.width, szHint.height));
     scrollbar_resize(width, height);
     scr_reset();
+    if (buffer_pixmap != None) {
+      scr_touch();
+    }
 
     if (curr_screen >= 0) {
       scr_change_screen(curr_screen);