diff --git a/sys/lib/libkern/arch/i386/memcpy.S b/sys/lib/libkern/arch/i386/memcpy.S
index 065c14fb2e38..7ccd0003eae3 100644
--- a/sys/lib/libkern/arch/i386/memcpy.S
+++ b/sys/lib/libkern/arch/i386/memcpy.S
@@ -1,4 +1,4 @@
-/*	$NetBSD: memcpy.S,v 1.4 2003/08/07 16:32:13 agc Exp $	*/
+/*	$NetBSD: memcpy.S,v 1.5 2004/04/15 09:20:29 yamt Exp $	*/
 
 /*-
  * Copyright (c) 1990 The Regents of the University of California.
@@ -35,7 +35,7 @@
 #include <machine/asm.h>
 
 #if defined(LIBC_SCCS)
-	RCSID("$NetBSD: memcpy.S,v 1.4 2003/08/07 16:32:13 agc Exp $")
+	RCSID("$NetBSD: memcpy.S,v 1.5 2004/04/15 09:20:29 yamt Exp $")
 #endif
 
 	/*
@@ -70,15 +70,15 @@ ENTRY(memcpy)
 	subl	%esi,%eax
 	cmpl	%ecx,%eax	/* overlapping? */
 	movl	%ecx,%eax
-	jb	backwards
+	jb	.Lbackwards
 #endif
 	cld			/* nope, copy forwards. */
 	shrl	$2,%ecx		/* copy by words */
 	rep
 	movsl
 	and	$3,%eax		/* any bytes left? */
-	jnz	trailing
-done:
+	jnz	.Ltrailing
+.Ldone:
 #if defined(MEMCPY) || defined(MEMMOVE)
 	movl	8(%esp),%eax
 #endif
@@ -86,26 +86,26 @@ done:
 	pop	%esi
 	ret
 
-trailing:
+.Ltrailing:
 	cmp	$2,%eax
 	jb	1f
 	movw	(%esi),%ax
 	movw	%ax,(%edi)
-	je	done
+	je	.Ldone
 	movb	2(%esi),%al
 	movb	%al,2(%edi)
-	jmp	done
+	jmp	.Ldone
 1:	movb	(%esi),%al
 	movb	%al,(%edi)
-	jmp	done
+	jmp	.Ldone
 
 #if !defined(NO_OVERLAP)
-backwards:
+.Lbackwards:
 	addl	%ecx,%edi	/* copy backwards. */
 	addl	%ecx,%esi
 	and	$3,%eax		/* any fractional bytes? */
-	jnz	back_align
-back_aligned:
+	jnz	.Lback_align
+.Lback_aligned:
 	shrl	$2,%ecx
 	subl	$4,%esi
 	subl	$4,%edi
@@ -113,9 +113,9 @@ back_aligned:
 	rep
 	movsl
 	cld
-	jmp	done
+	jmp	.Ldone
 
-back_align:
+.Lback_align:
 	sub	%eax,%esi
 	sub	%eax,%edi
 	cmp	$2,%eax
@@ -125,8 +125,8 @@ back_align:
 	movb	%al,2(%edi)
 2:	movw	(%esi),%ax
 	movw	%ax,(%edi)
-	jmp	back_aligned
+	jmp	.Lback_aligned
 1:	movb	(%esi),%al
 	movb	%al,(%edi)
-	jmp	back_aligned
+	jmp	.Lback_aligned
 #endif
diff --git a/sys/lib/libkern/arch/i386/memset.S b/sys/lib/libkern/arch/i386/memset.S
index 136e9b5de928..3f4683691556 100644
--- a/sys/lib/libkern/arch/i386/memset.S
+++ b/sys/lib/libkern/arch/i386/memset.S
@@ -1,4 +1,4 @@
-/*	$NetBSD: memset.S,v 1.5 2003/04/15 22:49:50 dsl Exp $	*/
+/*	$NetBSD: memset.S,v 1.6 2004/04/15 09:20:29 yamt Exp $	*/
 
 /*-
  * Copyright (c) 2003 The NetBSD Foundation, Inc.
@@ -39,7 +39,7 @@
 #include <machine/asm.h>
 
 #if defined(LIBC_SCCS)
-	RCSID("$NetBSD: memset.S,v 1.5 2003/04/15 22:49:50 dsl Exp $")
+	RCSID("$NetBSD: memset.S,v 1.6 2004/04/15 09:20:29 yamt Exp $")
 #endif
 
 #ifdef BZERO
@@ -75,7 +75,7 @@ ENTRY(memset)
 	 * The PII, PIII and PIV allseem to have a massive performance
 	 * drop when the initial target address is an odd multiple of 4.
 	 */
-	jbe	by_bytes
+	jbe	.Lby_bytes
 
 #ifndef BZERO
 	movb	%al,%ah			/* copy char to all bytes in word */
@@ -87,27 +87,27 @@ ENTRY(memset)
 	movl	%edi,%edx		/* detect misalignment */
 	neg	%edx
 	andl	$7,%edx
-	jnz	align
-aligned:
+	jnz	.Lalign
+.Laligned:
 	movl	%eax,-4(%edi,%ecx)	/* zap last 4 bytes */
 	shrl	$2,%ecx			/* zero by words */
 	rep
 	stosl
-done:
+.Ldone:
 #ifndef BZERO
 	movl	8(%esp),%eax		/* return address of buffer */
 #endif
 	pop	%edi
 	ret
 
-align:
+.Lalign:
 	movl	%eax,(%edi)		/* zap first 8 bytes */
 	movl	%eax,4(%edi)
 	subl	%edx,%ecx		/* remove from main count */
 	add	%edx,%edi
-	jmp	aligned
+	jmp	.Laligned
 
-by_bytes:
+.Lby_bytes:
 #endif	/* LIBKERN_OPTIMISE_SPACE */
 	rep
 	stosb