diff --git a/collects/drracket/private/main.rkt b/collects/drracket/private/main.rkt
index a0d4262663..30240d714c 100644
--- a/collects/drracket/private/main.rkt
+++ b/collects/drracket/private/main.rkt
@@ -64,6 +64,7 @@
 
 (application:current-app-name (string-constant drscheme))
 
+(preferences:set-default 'drracket:logger-receiver-string "error debug@GC debug@PLaneT" string?)
 (preferences:set-default 'drracket:logger-scroll-to-bottom? #t boolean?)
 
 (preferences:set-default 'drracket:submodules-to-choose-from 
diff --git a/collects/drracket/private/parse-logger-args.rkt b/collects/drracket/private/parse-logger-args.rkt
new file mode 100644
index 0000000000..55d941766c
--- /dev/null
+++ b/collects/drracket/private/parse-logger-args.rkt
@@ -0,0 +1,46 @@
+#lang racket/base
+
+(provide parse-logger-args)
+
+(define (parse-logger-args str)
+  (define levels '(none fatal error warning info debug))
+  (define arglist
+    (let loop ([args (regexp-split #rx" +" str)]
+               [first? #t]
+               [result '()])
+      (cond
+        [(null? args) result]
+        [(equal? (car args) "") (loop (cdr args) first? result)]
+        [else
+         (define arg (car args))
+         (cond
+           [(and first? (member (string->symbol arg) levels))
+            (loop (cdr args) #f (list* (string->symbol arg) #f result))]
+           [(regexp-match #rx"^(.*)@([^@]*)$" arg)
+            =>
+            (λ (m)
+              (define level (string->symbol (list-ref m 1)))
+              (define name (string->symbol (list-ref m 2)))
+              (cond
+                [(member level levels) 
+                 (loop (cdr args) #f (list* level name result))]
+                [else #f]))]
+           [else #f])])))
+  (if (null? arglist)
+      #f
+      arglist))
+
+(module+ test 
+  (require rackunit)
+  (check-equal? (parse-logger-args "") #f)
+  (check-equal? (parse-logger-args "    ") #f)
+  (check-equal? (parse-logger-args "info") '(info #f))
+  (check-equal? (parse-logger-args "debug") '(debug #f))
+  (check-equal? (parse-logger-args " info ") '(info #f))
+  (check-equal? (parse-logger-args " info ") '(info #f))
+  (check-equal? (parse-logger-args "info debug@GC") '(debug GC info #f))
+  (check-equal? (parse-logger-args "info   debug@GC  ") '(debug GC info #f))
+  (check-equal? (parse-logger-args "info   debug@GC@  ") #f)
+  (check-equal? (parse-logger-args "info   debug@GC none@GC@  ") #f)
+  (check-equal? (parse-logger-args "info   debug@GC none@GC  ") '(none GC debug GC info #F))
+  (check-equal? (parse-logger-args " debug@GC  ") '(debug GC)))
diff --git a/collects/drracket/private/rep.rkt b/collects/drracket/private/rep.rkt
index e3aeff8172..0f87a0620e 100644
--- a/collects/drracket/private/rep.rkt
+++ b/collects/drracket/private/rep.rkt
@@ -30,6 +30,7 @@ TODO
          "drsig.rkt"
          "local-member-names.rkt"
          "stack-checkpoint.rkt"
+         "parse-logger-args.rkt"
          
          ;; the dynamic-require below loads this module, 
          ;; so we make the dependency explicit here, even
@@ -809,7 +810,7 @@ TODO
              (user-namespace-box (make-weak-box #f))
              (user-eventspace-main-thread #f)
              (user-break-parameterization #f)
-             (user-logger (make-logger))
+             (user-logger drracket:init:system-logger) ;; for now, just let all messages be everywhere
              
              ;; user-exit-code (union #f byte?)
              ;; #f indicates that exit wasn't called. Integer indicates exit code
@@ -1262,32 +1263,6 @@ TODO
                  
                  (current-logger user-logger)
                  
-                 (thread
-                  (λ ()
-                    (struct gui-event (start end name) #:prefab)
-                    ;; forward system events the user's logger, and record any
-                    ;; events that happen on the user's logger to show in the GUI
-                    (let ([sys-evt (make-log-receiver drracket:init:system-logger 'debug)]
-                          [user-evt (make-log-receiver user-logger 'debug)])
-                      (let loop ()
-                        (sync
-                         (handle-evt
-                          sys-evt
-                          (λ (logged)
-                            (unless (gui-event? (vector-ref logged 2))
-                              (log-message user-logger 
-                                           (vector-ref logged 0)
-                                           (vector-ref logged 1)
-                                           (vector-ref logged 2)))
-                            (loop)))
-                         (handle-evt
-                          user-evt
-                          (λ (vec)
-                            (unless (gui-event? (vector-ref vec 2))
-                              (parameterize ([current-eventspace drracket:init:system-eventspace])
-                                (queue-callback (λ () (new-log-message vec)))))
-                            (loop))))))))
-                 
                  (initialize-parameters snip-classes)
                  (let ([drracket-exit-handler
                         (λ (x)
@@ -1463,28 +1438,81 @@ TODO
       
       (define logger-editor #f)
       (define logger-messages '())
+      (define user-log-receiver-args-str (preferences:get 'drracket:logger-receiver-string))
+      (define user-log-receiver #f)
+      (define/public (set-user-log-receiver-args str args) 
+        (set! user-log-receiver-args-str str)
+        (update-log-receiver-to-match-str))
+      (define/public (get-user-log-receiver-args-str) user-log-receiver-args-str)
+      (define/public (enable/disable-capture-log logging-on?)
+        (cond
+          [logging-on?
+           (update-log-receiver-to-match-str)]
+          [else
+           (when user-log-receiver
+             (set! user-log-receiver #f)
+             (semaphore-post user-log-receiver-changed))]))
+      (define/private (update-log-receiver-to-match-str)
+        (define args (parse-logger-args user-log-receiver-args-str))
+        (set! user-log-receiver
+              (and args
+                   (apply make-log-receiver user-logger args)))
+        (semaphore-post user-log-receiver-changed))
+      
+      (define/private (inform-user-logger-thread-that-logger-changed)
+        (semaphore-post user-log-receiver-changed))
+      (define user-log-receiver-changed (make-semaphore 0))
+      (thread
+       (λ ()
+         (struct gui-event (start end name) #:prefab)
+         (define callback-running? #f)
+         (define evts '())
+         (define sema (make-semaphore 1))
+         (define (user-event-handler-callback)
+           (semaphore-wait sema)
+           (define my-evts evts)
+           (set! evts '())
+           (set! callback-running? #f)
+           (semaphore-post sema)
+           (for ([vec (in-list (reverse my-evts))])
+             (new-log-message vec)))
+         (let loop ()
+           (sync
+            (handle-evt user-log-receiver-changed
+                        (λ (_) (loop)))
+            (if user-log-receiver
+                (handle-evt user-log-receiver
+                            (λ (vec)
+                              (unless (gui-event? (vector-ref vec 2))
+                                (semaphore-wait sema)
+                                (set! evts (cons vec evts))
+                                (unless callback-running?
+                                  (queue-callback user-event-handler-callback #f)
+                                  (set! callback-running? #t))
+                                (semaphore-post sema))
+                              (loop)))
+                never-evt)))))
       (define/public (get-logger-messages) logger-messages)
       (define/private (new-log-message vec)
-        (let* ([level (vector-ref vec 0)]
-               [str (cond
-                      [(<= (string-length (vector-ref vec 1)) log-entry-max-size)
-                       (vector-ref vec 1)]
-                      [else
-                       (substring (vector-ref vec 1) 0 log-entry-max-size)])]
-               [msg (vector level str)])
+        (define str
           (cond
-            [(< (length logger-messages) log-max-size)
-             (set! logger-messages (cons msg logger-messages))
-             (update-logger-gui (cons 'add-line msg))]
+            [(<= (string-length (vector-ref vec 1)) log-entry-max-size)
+             (vector-ref vec 1)]
             [else
-             (set! logger-messages
-                   (cons
-                    msg
-                    (let loop ([msgs logger-messages])
-                      (cond
-                        [(null? (cdr msgs)) null]
-                        [else (cons (car msgs) (loop (cdr msgs)))]))))
-             (update-logger-gui (cons 'clear-last-line-and-add-line msg))])))
+             (substring (vector-ref vec 1) 0 log-entry-max-size)]))
+        (cond
+          [(< (length logger-messages) log-max-size)
+           (set! logger-messages (cons str logger-messages))
+           (update-logger-gui (cons 'add-line str))]
+          [else
+           (set! logger-messages
+                 (cons
+                  str
+                  (let loop ([msgs logger-messages])
+                    (cond
+                      [(null? (cdr msgs)) null]
+                      [else (cons (car msgs) (loop (cdr msgs)))]))))
+           (update-logger-gui (cons 'clear-last-line-and-add-line str))]))
       
       (define/private (reset-logger-messages) 
         (set! logger-messages '())
diff --git a/collects/drracket/private/unit.rkt b/collects/drracket/private/unit.rkt
index 22f237ad49..ffd6e8193b 100644
--- a/collects/drracket/private/unit.rkt
+++ b/collects/drracket/private/unit.rkt
@@ -37,6 +37,7 @@ module browser threading seems wrong.
          "get-defs.rkt"
          "local-member-names.rkt"
          "eval-helpers.rkt"
+         "parse-logger-args.rkt"
          (prefix-in drracket:arrow: "../arrow.rkt")
          (prefix-in icons: images/compile-time)
          mred
@@ -45,7 +46,11 @@ module browser threading seems wrong.
          mzlib/date
          
          framework/private/aspell
-         framework/private/logging-timer)
+         framework/private/logging-timer
+         
+         scribble/xref
+         setup/xref
+         (only-in scribble/base doc-prefix))
 
 (provide unit@)
 
@@ -1324,11 +1329,13 @@ module browser threading seems wrong.
       (define log-visible? #f)
       (define/public-final (toggle-log)
         (set! log-visible? (not log-visible?))
-        (send frame show/hide-log log-visible?))
+        (send frame show/hide-log log-visible?)
+        (send (get-ints) enable/disable-capture-log log-visible?))
       (define/public-final (hide-log)
         (when log-visible? (toggle-log)))
       (define/public-final (update-log)
-        (send frame show/hide-log log-visible?))
+        (send frame show/hide-log log-visible?)
+        (send frame set-logger-text-field-value (send (get-ints) get-user-log-receiver-args-str)))
       (define/public-final (update-logger-window command)
         (when (is-current-tab?)
           (send frame update-logger-window command)))
@@ -1355,6 +1362,7 @@ module browser threading seems wrong.
     enable-evaluation-in-tab
     update-toolbar-visibility
     show/hide-log
+    set-logger-text-field-value
     show-planet-status)
   
   (define frame-mixin
@@ -1460,12 +1468,14 @@ module browser threading seems wrong.
       (define logger-panel #f)
       (define logger-parent-panel #f)
       
-      ;; logger-gui-tab-panel: (or/c #f (is-a?/c tab-panel%))
+      ;; logger-gui-content-panel: (or/c #f (is-a?/c vertical-panel%))
       ;; this is #f when the GUI has not been built yet. After
-      ;; it becomes a tab-panel, it is always a tab-panel (altho the tab panel might not always be shown)
-      (define logger-gui-tab-panel #f)
+      ;; it becomes a panel, it is always a panel 
+      ;; (altho the panel might not always be shown)
+      (define logger-gui-content-panel #f)
       (define logger-gui-canvas #f)
       (define logger-checkbox #f)
+      (define logger-text-field #f)
       
       ;; logger-gui-text: (or/c #f (is-a?/c text%))
       ;; this is #f when the GUI has not been built or when the logging panel is hidden
@@ -1478,7 +1488,7 @@ module browser threading seems wrong.
         (let ([p (preferences:get 'drracket:logging-size-percentage)])
           (begin-container-sequence)
           (cond
-            [logger-gui-tab-panel
+            [logger-gui-content-panel
              (send logger-parent-panel change-children
                    (λ (l)
                      (cond
@@ -1502,34 +1512,67 @@ module browser threading seems wrong.
                         (remq logger-panel l)])))]
             [else
              (when show? ;; if we want to hide and it isn't built yet, do nothing
-               (define logger-gui-tab-panel-parent (new horizontal-panel% 
-                                                        [parent logger-panel]
-                                                        [stretchable-height #f]))
-               (set! logger-gui-tab-panel
-                     (new tab-panel% 
-                          [choices (list (string-constant logging-all)
-                                         "fatal" "error" "warning" "info" "debug")]
-                          [parent logger-gui-tab-panel-parent]
-                          [stretchable-height #f]
-                          [style '(no-border)]
-                          [callback
-                           (λ (tp evt)
-                             (preferences:set 'drracket:logger-gui-tab-panel-level
-                                              (send logger-gui-tab-panel get-selection))
-                             (update-logger-window #f))]))
-               (new button% [label (string-constant hide-log)]
-                    [callback (λ (x y) (send current-tab hide-log))]
-                    [parent logger-gui-tab-panel-parent])
-               (send logger-gui-tab-panel set-selection (preferences:get 'drracket:logger-gui-tab-panel-level))
+               (define logger-gui-content-panel-parent (new vertical-panel%
+                                                            [style '(border)]
+                                                            [parent logger-panel]
+                                                            [stretchable-height #t]))
+               (set! logger-gui-content-panel
+                     (new horizontal-panel%
+                          [parent logger-gui-content-panel-parent]
+                          [stretchable-height #f]))
                (new-logger-text)
                (set! logger-gui-canvas 
-                     (new editor-canvas% [parent logger-panel] [editor logger-gui-text]))
+                     (new editor-canvas%
+                          [parent logger-gui-content-panel-parent]
+                          [style '(transparent no-border)]
+                          [editor logger-gui-text]))
+               (new message% [label (string-constant log-messages)] [parent logger-gui-content-panel])
+               (new button% 
+                    [label (string-constant help)]
+                    [callback (λ (x y) 
+                                (define-values (path tag) 
+                                  (xref-tag->path+anchor (load-collections-xref)
+                                                         `(part
+                                                           ,(doc-prefix
+                                                             '(lib "scribblings/drracket/drracket.scrbl")
+                                                             #f
+                                                             "follow-log"))))
+                                (define url (path->url path))
+                                (define url2 (if tag
+                                                 (make-url (url-scheme url)
+                                                           (url-user url)
+                                                           (url-host url)
+                                                           (url-port url)
+                                                           (url-path-absolute? url)
+                                                           (url-path url)
+                                                           (url-query url)
+                                                           tag)
+                                                 url))
+                                (send-url (url->string url2)))]
+                    [parent logger-gui-content-panel])
+               (set! logger-text-field
+                     (new text-field% 
+                          [parent logger-gui-content-panel] 
+                          [label "‹level›@‹name› ..."]
+                          [init-value (send (get-interactions-text) get-user-log-receiver-args-str)]
+                          [callback
+                           (λ (tf evt)
+                             (define str (send (send tf get-editor) get-text))
+                             (define args (parse-logger-args str))
+                             (preferences:set 'drracket:logger-receiver-string str)
+                             (send (get-interactions-text) set-user-log-receiver-args str (if (null? args) #f args))
+                             (set-logger-text-field-bg-color args))]))
+               (set-logger-text-field-bg-color (parse-logger-args (send logger-text-field get-value)))
                (set! logger-checkbox 
                      (new check-box%
                           [label (string-constant logger-scroll-on-output)]
                           [callback (λ (a b) (preferences:set 'drracket:logger-scroll-to-bottom? (send logger-checkbox get-value)))]
-                          [parent logger-panel]
+                          [parent logger-gui-content-panel]
                           [value (preferences:get 'drracket:logger-scroll-to-bottom?)]))
+               (new button% 
+                    [label (string-constant hide-log)]
+                    [callback (λ (x y) (send current-tab hide-log))]
+                    [parent logger-gui-content-panel])
                (send logger-menu-item set-label (string-constant hide-log))
                (update-logger-window #f)
                (send logger-parent-panel change-children (lambda (l) (append l (list logger-panel)))))])
@@ -1538,8 +1581,16 @@ module browser threading seems wrong.
           (update-logger-button-label)
           (end-container-sequence)))
       
+      (define/public (set-logger-text-field-value str)
+        (send logger-text-field set-value str)
+        (set-logger-text-field-bg-color (parse-logger-args str)))
+      
+      (define/private (set-logger-text-field-bg-color good?)
+        (send logger-text-field set-field-background 
+              (send the-color-database find-color (if good? "white" "pink"))))
+      
       (define/private (log-shown?)
-        (and logger-gui-tab-panel
+        (and logger-gui-content-panel
              (member logger-panel (send logger-parent-panel get-children))))
       
       (define/private (new-logger-text)
@@ -1550,75 +1601,62 @@ module browser threading seems wrong.
       
       (define/public (update-logger-window command)
         (when logger-gui-text 
-          (let ([admin (send logger-gui-text get-admin)]
-                [canvas (send logger-gui-text get-canvas)])
-            (when (and canvas admin)
-              (let ([logger-messages (send interactions-text get-logger-messages)]
-                    [level (case (send logger-gui-tab-panel get-selection)
-                             [(0) #f]
-                             [(1) 'fatal]
-                             [(2) 'error]
-                             [(3) 'warning]
-                             [(4) 'info]
-                             [(5) 'debug])])
-                (cond
-                  [(and (pair? command)
-                        (pair? logger-messages)
-                        ;; just flush and redraw everything if there is one (or zero) logger messages
-                        (pair? (cdr logger-messages)))
-                   (let ([msg (cdr command)])
-                     (when (or (not level) 
-                               (eq? (vector-ref msg 0) level))
-                       (define scroll? (if (object? logger-checkbox)
-                                           (send logger-checkbox get-value)
-                                           #t))
-                       (send logger-gui-text begin-edit-sequence)
-                       (send logger-gui-text lock #f)
-                       (case (car command)
-                         [(add-line) (void)]
-                         [(clear-last-and-add-line)
-                          (send logger-gui-text delete
-                                0
-                                (send logger-gui-text paragraph-start-position 1)
-                                #f)])
-                       (send logger-gui-text insert
-                             "\n"
-                             (send logger-gui-text last-position)
-                             (send logger-gui-text last-position)
-                             #f)
-                       (send logger-gui-text insert 
-                             (vector-ref msg 1) 
-                             (send logger-gui-text last-position)
-                             (send logger-gui-text last-position)
-                             #f)
-                       (when scroll?
-                         (send logger-gui-text scroll-to-position
-                               (send logger-gui-text
-                                     paragraph-start-position
-                                     (send logger-gui-text last-paragraph))))
-                       (send logger-gui-text end-edit-sequence)
-                       (send logger-gui-text lock #t)))]
-                  [else
-                   (send logger-gui-text begin-edit-sequence)
-                   (send logger-gui-text lock #f)
-                   (send logger-gui-text erase)
-                   
-                   (let ([insert-one
-                          (λ (x newline?)
-                            (when (or (not level)
-                                      (eq? level (vector-ref x 0)))
-                              (when newline? (send logger-gui-text insert "\n" 0 0))
-                              (send logger-gui-text insert (vector-ref x 1) 0 0)))]) 
-                     
-                     (unless (null? logger-messages)
-                       ;; skip the last newline in the buffer
-                       (insert-one (car logger-messages) #f)
-                       (for-each
-                        (λ (x) (insert-one x #t))
-                        (cdr (send interactions-text get-logger-messages)))))
-                   
-                   (send logger-gui-text lock #t)
-                   (send logger-gui-text end-edit-sequence)]))))))
+          (define admin (send logger-gui-text get-admin))
+          (define canvas (send logger-gui-text get-canvas))
+          (when (and canvas admin)
+            (define logger-messages (send interactions-text get-logger-messages))
+            (cond
+              [(and (pair? command)
+                    (pair? logger-messages)
+                    ;; just flush and redraw everything if there is one (or zero) logger messages
+                    (pair? (cdr logger-messages)))
+               (define msg (cdr command))
+               (define scroll? (if (object? logger-checkbox)
+                                   (send logger-checkbox get-value)
+                                   #t))
+               (send logger-gui-text begin-edit-sequence)
+               (send logger-gui-text lock #f)
+               (case (car command)
+                 [(add-line) (void)]
+                 [(clear-last-and-add-line)
+                  (send logger-gui-text delete
+                        0
+                        (send logger-gui-text paragraph-start-position 1)
+                        #f)])
+               (send logger-gui-text insert
+                     "\n"
+                     (send logger-gui-text last-position)
+                     (send logger-gui-text last-position)
+                     #f)
+               (send logger-gui-text insert 
+                     msg 
+                     (send logger-gui-text last-position)
+                     (send logger-gui-text last-position)
+                     #f)
+               (when scroll?
+                 (send logger-gui-text scroll-to-position
+                       (send logger-gui-text
+                             paragraph-start-position
+                             (send logger-gui-text last-paragraph))))
+               (send logger-gui-text end-edit-sequence)
+               (send logger-gui-text lock #t)]
+              [else
+               (send logger-gui-text begin-edit-sequence)
+               (send logger-gui-text lock #f)
+               (send logger-gui-text erase)
+               
+               (define (insert-one msg)
+                 (send logger-gui-text insert msg 0 0)) 
+               
+               (unless (null? logger-messages)
+                 ;; skip the last newline in the buffer
+                 (insert-one (car logger-messages))
+                 (for ([msg (in-list (cdr (send interactions-text get-logger-messages)))])
+                   (insert-one "\n")
+                   (insert-one msg)))
+               
+               (send logger-gui-text lock #t)
+               (send logger-gui-text end-edit-sequence)]))))
       
       ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
       ;;
diff --git a/collects/scribblings/drracket/interface-essentials.scrbl b/collects/scribblings/drracket/interface-essentials.scrbl
index 0ba71149e0..9cc40f01d1 100644
--- a/collects/scribblings/drracket/interface-essentials.scrbl
+++ b/collects/scribblings/drracket/interface-essentials.scrbl
@@ -816,3 +816,13 @@ disable debugging, open the language dialog, click the @onscreen{Show
 Details} button, and select @onscreen{No debugging or profiling}, if
 it is available.
 
+@section[#:tag "follow-log"]{Following Log Messages}
+
+The @onscreen{Show Log} menu item in the @onscreen{View} menu opens
+a pane in the DrRacket window showing log messages. 
+
+Along the top of the window is a text field that should be filled with
+a description of which log messages are interesting, as described in
+the @secref[#:doc '(lib "scribblings/reference/reference.scrbl") "logging"]
+section of @other-doc['(lib "scribblings/reference/reference.scrbl")].
+
diff --git a/collects/string-constants/private/english-string-constants.rkt b/collects/string-constants/private/english-string-constants.rkt
index 7994a07856..8c832ba6c8 100644
--- a/collects/string-constants/private/english-string-constants.rkt
+++ b/collects/string-constants/private/english-string-constants.rkt
@@ -311,8 +311,8 @@ please adhere to these guidelines:
   ;; menu items connected to the logger -- also in a button in the planet status line in the drs frame
   (show-log "Show &Log")
   (hide-log "Hide &Log")
-  (logging-all "All") ;; in the logging window in drscheme, shows all logs simultaneously
-  (logger-scroll-on-output "Scroll to show new output") ; a checkbox in the logger pane
+  (logger-scroll-on-output "Scroll on output") ; a checkbox in the logger pane
+  (log-messages "Log Messages") ;; label for the drracket logging gui panel
   
  ;; modes
  (mode-submenu-label "Modes")
diff --git a/doc/release-notes/drracket/HISTORY.txt b/doc/release-notes/drracket/HISTORY.txt
index d13538382f..6e8e61b6ce 100644
--- a/doc/release-notes/drracket/HISTORY.txt
+++ b/doc/release-notes/drracket/HISTORY.txt
@@ -45,6 +45,8 @@
     the highlight disappear completely when completely inside an
     error.
 
+  . Improved the log message gui
+
 ------------------------------
        Version 5.3.1
 ------------------------------