diff --git a/docs/CHANGES.txt b/docs/CHANGES.txt
index b5e24b2e9..30240b8a9 100644
--- a/docs/CHANGES.txt
+++ b/docs/CHANGES.txt
@@ -7,7 +7,7 @@ bill@newbreedsoftware.com
 http://www.newbreedsoftware.com/tuxpaint/
 
 
-2005.Oct.3 (0.9.15)
+2005.Oct.5 (0.9.15)
 
   * uncatagorized and messy:
     -----------------------
@@ -115,6 +115,8 @@ http://www.newbreedsoftware.com/tuxpaint/
       displays (e.g., Mac monitors)
       Albert Cahalan <albert@users.sf.net>
   
+    * Now defaults to 800x600 screen size.  Welcome to the future. ;^)
+
     * Switched from using 16bpp display surfaces to 32bpp, to reduce
       discoloration. ("#define" options exist at the top of src/tuxpaint.c
       to choose which you want.)
diff --git a/src/tuxpaint.c b/src/tuxpaint.c
index 8cbccce69..f82fe111c 100644
--- a/src/tuxpaint.c
+++ b/src/tuxpaint.c
@@ -7553,8 +7553,10 @@ static void setup(int argc, char * argv[])
   use_print_config = 0;
   mirrorstamps = 0;
   disable_stamp_controls = 0;
-  WINDOW_WIDTH = 640;
-  WINDOW_HEIGHT = 480;
+  //  WINDOW_WIDTH = 640;
+  //  WINDOW_HEIGHT = 480;
+  WINDOW_WIDTH = 800;
+  WINDOW_HEIGHT = 600;
   playfile = NULL;
   recording = 0;
   playing = 0;