diff --git a/collects/setup/plt-installer-unit.rkt b/collects/setup/plt-installer-unit.rkt
index 11116c36b1..e17322fd20 100644
--- a/collects/setup/plt-installer-unit.rkt
+++ b/collects/setup/plt-installer-unit.rkt
@@ -38,9 +38,9 @@
                                      (stretchable-height #f)
                                      (alignment '(center center)))]
                      [kill-button (make-object button%
-				    (string-constant plt-installer-abort-installation)
-				    button-panel
-				    (lambda (b e) (kill)))]
+                                    (string-constant plt-installer-abort-installation)
+                                    button-panel
+                                    (lambda (b e) (kill)))]
                      [done (make-object button% (string-constant close) button-panel (lambda (b e) (done-callback)))]
                      [output (make-output-port
                               #f
@@ -102,9 +102,11 @@
                      (parameterize ([current-eventspace orig-eventspace])
                        (queue-callback
                         (lambda ()
+                          (fprintf output "\nInstallation complete.\n")
                           (set! completed-successfully? #t)
                           ((on-installer-run))
-                          (cleanup-thunk))))
+                          (cleanup-thunk)
+                          (custodian-shutdown-all installer-cust))))
                      
                      (send done enable #t)))))))))
       
diff --git a/doc/release-notes/drracket/HISTORY.txt b/doc/release-notes/drracket/HISTORY.txt
index ff2178fc16..f515fdd98a 100644
--- a/doc/release-notes/drracket/HISTORY.txt
+++ b/doc/release-notes/drracket/HISTORY.txt
@@ -13,6 +13,11 @@
     word-wrapping (this avoids some performance problems when very
     large values are rendered there)
 
+  . Adjust the Install .plt File dialog so that it cleans up after the
+    end of an installation (specifically, it shuts down the custodian
+    that was running the installation process), which also causes the 
+    Abort button to be disabled.
+
 ------------------------------
        Version 5.3
 ------------------------------