diff --git a/lib-src/ChangeLog b/lib-src/ChangeLog
index 41c93d0ae67..228a579c651 100644
--- a/lib-src/ChangeLog
+++ b/lib-src/ChangeLog
@@ -1,3 +1,7 @@
+2008-10-31  Andreas Schwab  <schwab@suse.de>
+
+	* emacsclient.c (main): Don't force sending tty when in eval mode.
+
 2008-10-30  Chong Yidong  <cyd@stupidchicken.com>
 
 	* emacsclient.c (main): If using the current frame, send tty
diff --git a/lib-src/emacsclient.c b/lib-src/emacsclient.c
index 0bbc385d07f..921fc2054e3 100644
--- a/lib-src/emacsclient.c
+++ b/lib-src/emacsclient.c
@@ -1440,7 +1440,7 @@ main (argc, argv)
   /* If using the current frame, send tty information to Emacs anyway.
      In daemon mode, Emacs may need to occupy this tty if no other
      frame is available.  */
-  if (tty || current_frame)
+  if (tty || (current_frame && !eval))
     {
       char *type = egetenv ("TERM");
       char *tty_name = NULL;