diff --git a/src/etc/root/dot.login b/src/etc/root/dot.login
index e35a02bd..74a5d6f3 100644
--- a/src/etc/root/dot.login
+++ b/src/etc/root/dot.login
@@ -1,11 +1,15 @@
-# $OpenBSD: dot.login,v 1.12 2009/05/01 18:08:42 millert Exp $
+# $OpenBSD: dot.login,v 1.13 2009/05/06 22:02:05 millert Exp $
 #
 # csh login file
 
 if ( -x /usr/bin/tset ) then
 	set noglob histchars=""
 	onintr finish
-	eval `tset -sQ '-munknown:?vt220' $TERM`
+	if ( $?XTERM_VERSION ) then
+		eval `tset -IsQ '-munknown:?vt220' $TERM`
+	else
+		eval `tset -sQ '-munknown:?vt220' $TERM`
+	endif
 	finish:
 	unset noglob histchars
 	onintr
diff --git a/src/etc/root/dot.profile b/src/etc/root/dot.profile
index a57b1f13..9f958766 100644
--- a/src/etc/root/dot.profile
+++ b/src/etc/root/dot.profile
@@ -1,4 +1,4 @@
-# $OpenBSD: dot.profile,v 1.7 2009/05/01 18:08:43 millert Exp $
+# $OpenBSD: dot.profile,v 1.8 2009/05/06 22:02:05 millert Exp $
 #
 # sh/ksh initialization
 
@@ -9,5 +9,9 @@ export HOME
 umask 022
 
 if [ -x /usr/bin/tset ]; then
-	eval `/usr/bin/tset -sQ '-munknown:?vt220' $TERM`
+	if [ X"$XTERM_VERSION" = X"" ]; then
+		eval `/usr/bin/tset -sQ '-munknown:?vt220' $TERM`
+	else
+		eval `/usr/bin/tset -IsQ '-munknown:?vt220' $TERM`
+	fi
 fi
diff --git a/src/etc/skel/dot.login b/src/etc/skel/dot.login
index ff337e86..2c2d6397 100644
--- a/src/etc/skel/dot.login
+++ b/src/etc/skel/dot.login
@@ -1,9 +1,13 @@
-# $OpenBSD: dot.login,v 1.4 2009/01/30 08:42:26 sobrado Exp $
+# $OpenBSD: dot.login,v 1.5 2009/05/06 22:02:05 millert Exp $
 #
 # csh login file
 
 if ( ! $?TERMCAP ) then
-	tset -Q '-mdialup:?vt100' $TERM
+	if ( $?XTERM_VERSION ) then
+		tset -IQ '-munknown:?vt220' $TERM
+	else
+		tset -Q '-munknown:?vt220' $TERM
+	endif
 endif
 
 stty	newcrt crterase