diff --git a/src/ChangeLog b/src/ChangeLog
index 97135252c25..fc64f7e33f8 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,9 @@
+2008-08-30  Eli Zaretskii  <eliz@gnu.org>
+
+	* dispnew.c (init_display): Set `tty's association in frame's
+	parameters alist to the name of the terminal device, if that is
+	known.
+
 2008-08-29  Jason Rumney  <jasonr@gnu.org>
 
 	* w32uniscribe.c (uniscribe_check_otf): Don't fallback on DFLT script.
diff --git a/src/dispnew.c b/src/dispnew.c
index 895b6490dae..48a8bd283c3 100644
--- a/src/dispnew.c
+++ b/src/dispnew.c
@@ -6944,7 +6944,13 @@ init_display ()
     Fmodify_frame_parameters
       (selected_frame, Fcons (Fcons (Qtty_type,
                                      Ftty_type (selected_frame)), Qnil));
-    Fmodify_frame_parameters (selected_frame, Fcons (Fcons (Qtty, Qnil), Qnil));
+    if (t->display_info.tty->name)
+      Fmodify_frame_parameters (selected_frame,
+				Fcons (Fcons (Qtty, build_string (t->display_info.tty->name)),
+				       Qnil));
+    else
+      Fmodify_frame_parameters (selected_frame, Fcons (Fcons (Qtty, Qnil),
+						       Qnil));
   }
 
   {