diff --git a/reactos/lib/string/Makefile.i386 b/reactos/lib/string/Makefile.i386
index 0b9d6ad421b..cc07036105b 100644
--- a/reactos/lib/string/Makefile.i386
+++ b/reactos/lib/string/Makefile.i386
@@ -1,9 +1,10 @@
-# $Id: Makefile.i386,v 1.1 2003/05/27 18:56:15 hbirr Exp $
+# $Id: Makefile.i386,v 1.2 2003/06/04 18:14:46 hbirr Exp $
 
 
 EXCLUDE_FILTER = \
 	memchr.o \
 	memcpy.o \
+	memmove.o \
 	memset.o \
 	strcat.o \
 	strchr.o \
diff --git a/reactos/lib/string/i386/memmove.s b/reactos/lib/string/i386/memmove.s
new file mode 100644
index 00000000000..64e3b7da2d5
--- /dev/null
+++ b/reactos/lib/string/i386/memmove.s
@@ -0,0 +1,116 @@
+/* 
+ * $Id: memmove.s,v 1.1 2003/06/04 18:14:46 hbirr Exp $
+ */
+
+/*
+ * void *memmove (void *to, const void *from, size_t count)
+ */
+
+.globl	_memmove
+
+_memmove:
+	push	%ebp
+	mov	%esp,%ebp
+	
+	push	%esi
+	push	%edi
+	
+	mov	8(%ebp),%edi
+	mov	12(%ebp),%esi
+	mov	16(%ebp),%ecx
+	
+	cmp	%esi,%edi
+	jbe	.CopyUp
+	mov	%ecx,%eax
+	add	%esi,%eax
+	cmp	%eax,%edi
+	jb	.CopyDown
+	
+.CopyUp:	
+	cld
+	
+	cmp	$16,%ecx
+	jb	.L1
+	mov	%ecx,%edx
+	test	$3,%edi
+	je	.L2
+/*
+ * Make the destination dword aligned
+ */
+        mov	%edi,%ecx
+        and	$3,%ecx
+        sub	$5,%ecx
+        not	%ecx
+        sub	%ecx,%edx
+        rep	movsb
+        mov	%edx,%ecx	
+.L2:
+	shr	$2,%ecx
+	rep	movsl
+	mov	%edx,%ecx
+	and	$3,%ecx
+.L1:	
+	test	%ecx,%ecx
+	je	.L3
+	rep	movsb
+.L3:
+	mov	16(%ebp),%eax
+	pop	%edi
+	pop	%esi
+	leave
+	ret
+
+.CopyDown:
+        std
+        
+	add	%ecx,%edi
+	add	%ecx,%esi
+	
+	cmp	$16,%ecx
+	jb	.L4
+        mov	%ecx,%edx
+	test	$3,%edi
+	je	.L5
+	
+/*
+ * Make the destination dword aligned
+ */
+	mov	%edi,%ecx
+	and	$3,%ecx
+	sub	%ecx,%edx
+	dec	%esi
+	dec	%edi
+	rep	movsb
+	mov	%edx,%ecx
+	
+	sub	$3,%esi
+	sub	$3,%edi
+.L6:	
+	shr	$2,%ecx
+	rep	movsl
+	mov	%edx,%ecx
+	and	$3,%ecx
+	je	.L7
+	add	$3,%esi
+	add	$3,%edi
+.L8:	
+	rep	movsb
+.L7:
+	cld
+	mov	8(%ebp),%eax
+	pop	%edi
+	pop	%esi
+	leave
+	ret
+.L5:
+	sub	$4,%edi
+	sub	$4,%esi
+	jmp	.L6
+		
+.L4:
+	test	%ecx,%ecx
+	je	.L7	
+	dec	%esi
+	dec	%edi
+	jmp	.L8
+