diff --git a/ChangeLog b/ChangeLog
index c029fdd5..56b1f1b1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 # $Id$
 
+2006-11-11
+	* Add max_user_text to documentation.
+	* Fixed BadWindow bugs (#1568366, #1588384).
+
 2006-11-10
 	* Remove on_bottom and xmms_player completely.
 	* Closed ibm_temps bug #1591609.
diff --git a/src/conky.c b/src/conky.c
index 212161c4..d41887e8 100644
--- a/src/conky.c
+++ b/src/conky.c
@@ -5602,7 +5602,7 @@ static void clear_text(int exposures)
 #endif
 	{
 	/* there is some extra space for borders and outlines */
-	XClearArea(display, window.drawable,
+	XClearArea(display, window.window,
 		   text_start_x - border_margin - 1,
 		   text_start_y - border_margin - 1,
 		   text_width + border_margin * 2 + 2,
@@ -5722,11 +5722,11 @@ static void main_loop()
 					    text_height +
 					    border_margin * 2 + 1;
 					XResizeWindow(display,
-						      window.drawable,
+						      window.window,
 						      window.width,
 						      window.height);
 			if (own_window) {
-				set_transparent_background(window.drawable);
+				set_transparent_background(window.window);
 			}
 				     }