diff --git a/src/ChangeLog b/src/ChangeLog
index 1570dd9e3..46cc0011d 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
+1999-11-02  Miguel de Icaza  <miguel@gnu.org>
+
+	* main.c (OS_Setup): Do not warn if TERM is not set for the GNOME edition.
+
 1999-09-21  Federico Mena Quintero  <federico@redhat.com>
 
 	* dlg.c (dlg_broadcast_msg_to): Sigh.  Put in a GrossHack(tm) to
diff --git a/src/main.c b/src/main.c
index 027e78af7..dd7978d12 100644
--- a/src/main.c
+++ b/src/main.c
@@ -2373,7 +2373,9 @@ OS_Setup ()
 	
     termvalue = getenv ("TERM");
     if (!termvalue){
+#ifndef HAVE_X
 	fprintf (stderr, _("The TERM environment variable is unset!\n"));
+#endif
 	termvalue = "";
     }
 #ifndef HAVE_X