diff --git a/ChangeLog b/ChangeLog
index d7933f6..1ef5876 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2005-06-27  Karl Runge <runge@karlrunge.com>
+	* libvncserver/main.c: move deferUpdateTime and maxRectsPerUpdate
+	  defaults to before rfbProcessArguments().
+
 2005-06-18  Karl Runge <runge@karlrunge.com>
 	* configure.ac: don't use -R on HP-UX and OSF1.
 	* x11vnc: don't free the current cursor, close stderr
diff --git a/libvncserver/main.c b/libvncserver/main.c
index be67be5..a9161ce 100644
--- a/libvncserver/main.c
+++ b/libvncserver/main.c
@@ -624,6 +624,9 @@ rfbScreenInfoPtr rfbGetScreen(int* argc,char** argv,
 
    screen->listenInterface = htonl(INADDR_ANY);
 
+   screen->deferUpdateTime=5;
+   screen->maxRectsPerUpdate=50;
+
    if(!rfbProcessArguments(screen,argc,argv)) {
      free(screen);
      return NULL;
@@ -654,9 +657,6 @@ rfbScreenInfoPtr rfbGetScreen(int* argc,char** argv,
 
    IF_PTHREADS(screen->backgroundLoop = FALSE);
 
-   screen->deferUpdateTime=5;
-   screen->maxRectsPerUpdate=50;
-
    /* proc's and hook's */
 
    screen->kbdAddEvent = rfbDefaultKbdAddEvent;