diff --git a/sys/lib/libkern/arch/vax/Makefile.inc b/sys/lib/libkern/arch/vax/Makefile.inc
index d0966c770f38..251010082bea 100644
--- a/sys/lib/libkern/arch/vax/Makefile.inc
+++ b/sys/lib/libkern/arch/vax/Makefile.inc
@@ -1,6 +1,7 @@
-#	$NetBSD: Makefile.inc,v 1.16 2002/09/19 17:37:32 ragge Exp $
+#	$NetBSD: Makefile.inc,v 1.17 2003/08/13 11:32:23 ragge Exp $
 #
 #	The rest of the lib routines are in machine/macros.h
 #
 SRCS+=	__assert.c __main.c blkcpy.S blkset.S bswap64.S random.S \
-	strcasecmp.c strncasecmp.c strncmp.c strtoul.c udiv.S urem.S
+	strcasecmp.c strncasecmp.c strncmp.c strtoul.c udiv.S urem.S \
+	strncpy.c memcmp.c strcat.c strcpy.c strcmp.c strlen.c memchr.c
diff --git a/sys/lib/libkern/arch/vax/blkcpy.S b/sys/lib/libkern/arch/vax/blkcpy.S
index 9b0d1af56089..bbbeb887a8a9 100644
--- a/sys/lib/libkern/arch/vax/blkcpy.S
+++ b/sys/lib/libkern/arch/vax/blkcpy.S
@@ -1,8 +1,7 @@
-/*	$NetBSD: blkcpy.S,v 1.2 2002/02/24 00:08:22 matt Exp $	*/
-
-/* 
- * Copyright (c) 1994 Ludd, University of Lule}, Sweden.
- * All rights reserved.
+/*	$NetBSD: blkcpy.S,v 1.3 2003/08/13 11:32:23 ragge Exp $	*/
+/*
+ * Copyright (c) 1983, 1993
+ *	The Regents of the University of California.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -12,38 +11,60 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed at Ludd, University of Lule}.
- * 4. The name of the author may not be used to endorse or promote products
- *    derived from this software without specific prior written permission
+ * 3. Neither the name of the University nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
  *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
- * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
- * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
  */
-
 #include <machine/asm.h>
 
-/*
- * Copy a block of memory larger than 64K.
- */
-ENTRY(__blkcpy,R6)
+/* __blkcpy(from, to, size) */
+
+ENTRY(__blkcpy, R6)
 	movl	4(%ap),%r1
 	movl	8(%ap),%r3
 	movl	12(%ap),%r6
-	jbr	2f
-1:	subl2	%r0,%r6 
+	cmpl	%r1,%r3
+	bgtr	2f		# normal forward case
+	blss	3f		# overlapping, must do backwards
+	ret			# equal, nothing to do
+1:
+	subl2	%r0,%r6
 	movc3	%r0,(%r1),(%r3)
-2:	movzwl	$65535,%r0
+2:
+	movzwl	$65535,%r0
 	cmpl	%r6,%r0
 	jgtr	1b
 	movc3	%r6,(%r1),(%r3)
 	ret
+3:
+	addl2	%r6,%r1
+	addl2	%r6,%r3
+	movzwl	$65535,%r0
+	jbr	5f
+4:
+	subl2	%r0,%r6
+	subl2	%r0,%r1
+	subl2	%r0,%r3
+	movc3	%r0,(%r1),(%r3)
+	movzwl	$65535,%r0
+	subl2	%r0,%r1
+	subl2	%r0,%r3
+5:
+	cmpl	%r6,%r0
+	jgtr	4b
+	subl2	%r6,%r1
+	subl2	%r6,%r3
+	movc3	%r6,(%r1),(%r3)
+	ret