--- a/lisp/menubar-items.el	Mon Aug 13 11:11:38 2007 +0200
+++ b/lisp/menubar-items.el	Mon Aug 13 11:12:05 2007 +0200
@@ -237,10 +237,16 @@
                   (package-get-download-menu)))
        ["Update Package Index" package-get-update-base]
        ["List & Install" pui-list-packages]
-       ("Using Custom"
-	("Select" :filter (lambda (&rest junk)
-			  (cdr (custom-menu-create 'packages))))
-	["Update" package-get-custom])
+       ["Update Installed Packages" package-get-update-all]
+       ;; hack-o-matic, we can't force a laod of package-base here
+       ;; since it triggers dialog box interactions which we can't
+       ;; deal while using a menu
+       ("Using Custom" 
+	:filter (lambda (&rest junk)
+		  (if package-get-base
+		      (cdr (custom-menu-create 'packages))
+		    '(["Please load Package Index" (lamda (&rest junk) ()) nil]))))
+       
        ["Help" (Info-goto-node "(xemacs)Packages")])
 
       "---"
@@ -1491,10 +1497,18 @@
 (defun xemacs-splash-buffer ()
   "Redisplay XEmacs splash screen in a buffer."
   (interactive)
-  (let ((buffer (get-buffer-create "*Splash*")))
+  (let ((buffer (get-buffer-create "*Splash*"))
+	tmout)
     (set-buffer buffer)
+    (setq buffer-read-only t)
     (erase-buffer buffer)
-    (startup-splash-frame)
+    (setq tmout (display-splash-frame))
+    (when tmout
+      (make-local-hook 'kill-buffer-hook)
+      (add-hook 'kill-buffer-hook
+		`(lambda ()
+		   (disable-timeout ,tmout))
+		nil t))
     (pop-to-buffer buffer)
     (delete-other-windows)))