diff --git a/editors/vim/stable/Makefile b/editors/vim/stable/Makefile
index 1b2379c915a..2cdf31333e9 100644
--- a/editors/vim/stable/Makefile
+++ b/editors/vim/stable/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.18 2001/10/30 20:17:43 lebel Exp $
+# $OpenBSD: Makefile,v 1.19 2001/10/31 00:02:10 lebel Exp $
 
 COMMENT=	"vi clone, many additional features"
 
 DISTNAME=	vim-6.0
-PKGNAME=	${DISTNAME}.40
+PKGNAME=	${DISTNAME}.42
 CATEGORIES=	editors
 NEED_VERSION=	1.487
 MASTER_SITES=	ftp://ftp.vim.org/pub/vim/unix/ \
@@ -24,7 +24,7 @@ HOMEPAGE=	http://www.vim.org/
 MAINTAINER=	David Lebel <lebel@openbsd.org>
 
 .for p in 01 02 03 04 05 06 07 08 09 10 11 13 14 15 16 17 18 19 20 21 22 23 \
-	  24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40
+	  24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42
 PATCHFILES+=   6.0.0${p}:0
 .endfor
 
diff --git a/editors/vim/stable/files/md5 b/editors/vim/stable/files/md5
index f8208078bc7..a1cbccc49be 100644
--- a/editors/vim/stable/files/md5
+++ b/editors/vim/stable/files/md5
@@ -31,14 +31,15 @@ MD5 (vim6/6.0.031) = 8f0842da173ee5ee6cc54a9a7b9aea4e
 MD5 (vim6/6.0.032) = 35d4f9ab3ca5799ac71f6143e30a16c4
 MD5 (vim6/6.0.033) = 04cf07430fecf820e7d432a1cb38e225
 MD5 (vim6/6.0.034) = 6405ab69a538b4d1b3295312da32f683
-MD5 (vim6/6.0.035) = 5c3995dc853029d08efa45ddaf9e968c
+MD5 (vim6/6.0.035) = 861704f54f41cc602c072e8dd8c7de3a
 MD5 (vim6/6.0.036) = cab8afa7a00c21c4be1990a86d71c83b
 MD5 (vim6/6.0.037) = d4ba7257044e9dd7ff4ad2f3b171f003
 MD5 (vim6/6.0.038) = d2279ec93ea0e7447bf9b2bb830697e2
 MD5 (vim6/6.0.039) = 994016e06fefb87b0fd62709e744a612
 MD5 (vim6/6.0.040) = c961ae90339935c2d8f9e7a3777b84d8
+MD5 (vim6/6.0.041) = 75aa848d17902c397a9aeb1794b97546
+MD5 (vim6/6.0.042) = 2900f616a2d4a30b3848bb7d457fd0b2
 MD5 (vim6/vim-6.0-extra.tar.gz) = fd4349e202339c89f86f5bfb9af9fc85
-MD5 (vim6/vim-6.0-lang.tar.gz) = 75bda95398d44e3a9bd9fcdb90f0e989
 MD5 (vim6/vim-6.0.tar.bz2) = 9d9ca84d489af6b3f54639dd97af3774
 RMD160 (vim6/6.0.001) = e1963208bf160557fb5b66c9347daaaca23e3edd
 RMD160 (vim6/6.0.002) = 354c27b7dd75ab5e0a228b0bbedb1220725f3ab7
@@ -73,14 +74,15 @@ RMD160 (vim6/6.0.031) = ba3d054736f02c5a2b0004b7a5c4ffade4d7ea11
 RMD160 (vim6/6.0.032) = e013c8ec07a2972a680d0476a914e0c225a10cfd
 RMD160 (vim6/6.0.033) = be99b118e07099ffabdfbf704c63fe890ca4699d
 RMD160 (vim6/6.0.034) = 53f416bc700fc0e6d9b8759b4360b7f597c3adb3
-RMD160 (vim6/6.0.035) = 6af470c5209bd1018d47b159fd10105db740e501
+RMD160 (vim6/6.0.035) = b8383a8846e474016fc410de04fdc11eca088c87
 RMD160 (vim6/6.0.036) = 4f9a20497c9d68e6c652132d283b76b1ea689a4a
 RMD160 (vim6/6.0.037) = db3eef3a4594733bb8042b12dc9f27147b93d15b
 RMD160 (vim6/6.0.038) = fe924a6468bbcd9d4251d3ef0cec4bcb90a827c2
 RMD160 (vim6/6.0.039) = 42d1e8787f0a766650cd251511b2d737c27d5e5f
 RMD160 (vim6/6.0.040) = e9bb71059a3e8b41992b2285ffb788bedf40ab4c
+RMD160 (vim6/6.0.041) = 25849566047c121ff0f5ed6da0f6d7537513c142
+RMD160 (vim6/6.0.042) = a2517c04ba2078322c6805aae0f03c927379f83f
 RMD160 (vim6/vim-6.0-extra.tar.gz) = bc004fa12744dc3be42ec9196f4e72c9aad8d7f7
-RMD160 (vim6/vim-6.0-lang.tar.gz) = 2f81f527148a2b992ada958b7d36c719c494f8a6
 RMD160 (vim6/vim-6.0.tar.bz2) = bec4b517ef5acdc3d9c48d6112b8497f073fa56d
 SHA1 (vim6/6.0.001) = b8832e827afeac6743c2a051da152b1dd6087d09
 SHA1 (vim6/6.0.002) = 76c5f78e6f31a44b3969020740c61bddfd772fb8
@@ -115,12 +117,13 @@ SHA1 (vim6/6.0.031) = d30db983ea0ad92d6acd3a5daf7c2ee6fa8d7c91
 SHA1 (vim6/6.0.032) = f11962d1a67b64b6e35962b3ab70ee8d141ddd15
 SHA1 (vim6/6.0.033) = 17f102c3a9ae4a52d5311a044fa763d210b80bbf
 SHA1 (vim6/6.0.034) = fe829c89cc8f6eeff1e410acbb1392a8d1ee52e2
-SHA1 (vim6/6.0.035) = e5078631559cd923f50cc67530bc70889b832e25
+SHA1 (vim6/6.0.035) = 105db410dbe6e2ae579829fdfa20cc5c164dcd54
 SHA1 (vim6/6.0.036) = a73caf80eac5a91418d1ee4c703acdeabaa8425c
 SHA1 (vim6/6.0.037) = fabe048f0ebadd5d8fada91d78f74ef481dac49d
 SHA1 (vim6/6.0.038) = 9264d677cde73ebf2891369906e53cbf36a6c162
 SHA1 (vim6/6.0.039) = 2ff961f706ee338d29637be1bda964edbe0fa43e
 SHA1 (vim6/6.0.040) = ced9927cb04293af8d830866539a1483052a5e83
+SHA1 (vim6/6.0.041) = 174795f659d4aaba5cf6a19a770b794ed95c0541
+SHA1 (vim6/6.0.042) = c23450569cdc9cae6fa19593476ffceb1dcbc6f6
 SHA1 (vim6/vim-6.0-extra.tar.gz) = 1c3339aa103d0097ab79b84017168fabf47f79e5
-SHA1 (vim6/vim-6.0-lang.tar.gz) = e57a2e53bdb73426e3af0f61de87754cde870eb5
 SHA1 (vim6/vim-6.0.tar.bz2) = 65f3a54e2d04c20b7ffb0ae59741f97021dac49a