diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 0fd79e4ceba..3189447fee8 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,12 @@
+2002-05-08  Richard M. Stallman  <rms@gnu.org>
+
+	* mail/smtpmail.el (netrc-machine, netrc-get): Add autoloads.
+
+2002-05-08  Simon Marshall  <simon@gnu.org>
+
+	* msb.el (msb-menu-bar-update-buffers): Fixed frame menu to use
+	the frame name as the car of a menu entry, rather than the frame.
+
 2002-05-08  Juanma Barranquero  <lektu@terra.es>
 
 	* rfn-eshadow.el (read-file-name-electric-shadow-mode): Fix typos
diff --git a/lisp/msb.el b/lisp/msb.el
index 907bbbfa07f..2e19bb9d6d1 100644
--- a/lisp/msb.el
+++ b/lisp/msb.el
@@ -1114,9 +1114,8 @@ variable `msb-menu-cond'."
 		 (mapcar
 		  (lambda (frame)
 		    (nconc
-		     (list frame
-			   (cdr (assq 'name
-				      (frame-parameters frame)))
+		     (list (frame-parameter frame 'name)
+			   (frame-parameter frame 'name)
 			   (cons nil nil))
 		     'menu-bar-select-frame))
 		  frames)))))