diff --git a/share/termcap/termcap.src b/share/termcap/termcap.src
index d2c0b2f3f6f9..43b797f0cb35 100644
--- a/share/termcap/termcap.src
+++ b/share/termcap/termcap.src
@@ -1,4 +1,4 @@
-#	$NetBSD: termcap.src,v 1.66 2002/02/11 11:19:26 wiz Exp $
+#	$NetBSD: termcap.src,v 1.67 2002/02/11 19:14:43 wiz Exp $
 #
 ######## TERMINAL TYPE DESCRIPTIONS SOURCE FILE
 #
@@ -906,14 +906,15 @@ x68k|x68k-ite|NetBSD/x68k ITE:\
 # These are micro-minimal and probably need to be redone for real
 # after the manner of the pcvt entries.
 wsvt25|NetBSD wscons in 25 line DEC VT220 mode:\
-	:Co#16:NC#32:pa#256:ut:ms:\
+	:Co#16:NC#32:pa#256:ms:ut:\
+	:@1=\E[7~:@7=\E[8~:\
+	:k1=\E[11~:k2=\E[12~:k3=\E[13~:k4=\E[14~:k5=\E[15~:k6=\E[17~:\
+	:k7=\E[18~:k8=\E[19~:k9=\E[20~:k;=\E[21~:F1=\E[23~:F2=\E[24~:\
 	:AB=\E[4%dm:AF=\E[3%dm:op=\E[m:\
 	:co#80:li#25:tc=vt220:
 
 wsvt25m|NetBSD wscons in 25 line DEC VT220 mode with Meta:\
-	:Co#16:NC#32:pa#256:ut:ms:\
-	:AB=\E[4%dm:AF=\E[3%dm:op=\E[m:\
-	:co#80:li#25:km:tc=vt220:
+	:km:tc=wsvt25:
 
 #### FreeBSD console entries
 #
@@ -1852,16 +1853,17 @@ color_xterm|cx|cx100|color_xterm color terminal emulator for X:\
 rxvt|reduced xterm terminal (X Window System):\
 	:am:km:mi:ms:xn:xo:\
 	:co#80:it#8:li#24:\
-	:AL=\E[%dL:DC=\E[%dP:DL=\E[%dM:DO=\E[%dB:IC=\E[%d@:\
-	:K1=\EOq:K2=\EOr:K3=\EOs:K4=\EOp:K5=\EOn:LE=\E[%dD:\
+	:@1=\E[1~:@7=\E[8~:\
+	:AL=\E[%dL:DC=\E[%dP:DL=\E[%dM:DO=\E[%dB:F1=\E[23~:F2=\E[24~:\
+	:IC=\E[%d@:K1=\EOw:K2=\EOu:K3=\EOy:K4=\EOq:K5=\EOs:LE=\E[%dD:\
 	:RI=\E[%dC:UP=\E[%dA:ae=\E(B:al=\E[L:\
 	:as=\E(0:bl=^G:cd=\E[J:ce=\E[K:cl=\E[H\E[2J:\
 	:cm=\E[%i%d;%dH:cr=^M:cs=\E[%i%d;%dr:ct=\E[3g:dc=\E[P:\
 	:dl=\E[M:do=^J:ec=\E[%dX:ei=\E[4l:ho=\E[H:\
 	:i1=\E[?47l\E=\E[?1l:ic=\E[@:im=\E[4h:\
 	:is=\E[r\E[m\E[2J\E[H\E[?7h\E[?1;3;4;6l\E[4l:\
-	:k0=\E[21~:k1=\E[11~:k2=\E[12~:k3=\E[13~:k4=\E[14~:\
-	:k5=\E[15~:k6=\E[17~:k7=\E[18~:k8=\E[19~:k9=\E[20~:\
+	:k1=\E[11~:k2=\E[12~:k3=\E[13~:k4=\E[14~:k5=\E[15~:\
+	:k6=\E[17~:k7=\E[18~:k8=\E[19~:k9=\E[20~:k;=\E[21~:\
 	:kD=\E[3~:kI=\E[2~:kN=\E[6~:kP=\E[5~:kb=^H:kd=\E[B:ke=\E>:\
 	:kh=\E[7~:kl=\E[D:kr=\E[C:ks=\E=:ku=\E[A:le=^H:mb=\E[5m:\
 	:md=\E[1m:me=\E[m:mr=\E[7m:nd=\E[C:rc=\E8:sc=\E7:se=\E[27m:\