diff --git a/collects/drracket/private/main.rkt b/collects/drracket/private/main.rkt
index 30240d714c..79128187d3 100644
--- a/collects/drracket/private/main.rkt
+++ b/collects/drracket/private/main.rkt
@@ -176,11 +176,11 @@
   (let-values ([(w h) (get-display-size)])
     (set! frame-width (min frame-width (- w window-trimming-upper-bound-width)))
     (set! frame-height (min frame-height (- h window-trimming-upper-bound-height))))
-  (frame:setup-size-pref 'drracket:unit-window-size 
+  (frame:setup-size-pref 'drracket:window-size 
                          frame-width
                          frame-height 
                          #:position-preferences
-                         'drracket:unit-window-position))
+                         'drracket:window-position))
 
 (drr:set-default 'drracket:backtrace-window-width 400 number?)
 (drr:set-default 'drracket:backtrace-window-height 300 number?)
diff --git a/collects/drracket/private/unit.rkt b/collects/drracket/private/unit.rkt
index 40692451f0..f951e8220c 100644
--- a/collects/drracket/private/unit.rkt
+++ b/collects/drracket/private/unit.rkt
@@ -4350,8 +4350,8 @@ module browser threading seems wrong.
       (super-new
        [filename filename]
        [style '(toolbar-button)]
-       [size-preferences-key 'drracket:unit-window-size]
-       [position-preferences-key 'drracket:unit-window-position])
+       [size-preferences-key 'drracket:window-size]
+       [position-preferences-key 'drracket:window-position])
       
       (initialize-menus)
       
@@ -4571,7 +4571,7 @@ module browser threading seems wrong.
       
       (when (= 2 (length (send resizable-panel get-children)))
         (send resizable-panel set-percentages
-              (let ([p (preferences:get 'drracket:unit-window-size-percentage)])
+              (let ([p (preferences:get 'drracket:window-size-percentage)])
                 (list p (- 1 p)))))
       
       (set-label-prefix (string-constant drscheme))
diff --git a/doc/release-notes/drracket/HISTORY.txt b/doc/release-notes/drracket/HISTORY.txt
index 6e8e61b6ce..45a5deacc1 100644
--- a/doc/release-notes/drracket/HISTORY.txt
+++ b/doc/release-notes/drracket/HISTORY.txt
@@ -41,6 +41,11 @@
   
   . DrRacket's window can now be substantially narrower
 
+  . DrRacket's frame preferences are now remembered on a
+    per-montior-configuration basis and, if there is only one frame
+    open, it will move itself around automatically when the monitor
+    configuration changes
+
   . DrRacket's paren highlighting uses alpha-blending to avoid having
     the highlight disappear completely when completely inside an
     error.