diff --git a/ChangeLog b/ChangeLog
index 832520c10..0cc786f7e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2009-02-03 Enrico Weigelt, metux ITS <weigelt@metux.de>
+
+	* edit/editcmd.c, configure.ac: removed obsolete own implementation of memove (#242)
+
 2009-02-01 Enrico Weigelt, metux ITS <weigelt@metux.de>
 
 	* src/util.c: fixed name_trunc() on NULL or empty parameters
diff --git a/configure.ac b/configure.ac
index 0c2de009d..1dad2eecd 100644
--- a/configure.ac
+++ b/configure.ac
@@ -176,7 +176,7 @@ AC_CHECK_FUNCS([\
 	cfgetospeed \
 	getegid geteuid getgid getsid getuid \
 	initgroups isascii \
-	memcpy memmove memset \
+	memcpy memset \
 	putenv \
 	setreuid setuid statfs strerror strftime sysconf \
 	tcgetattr tcsetattr truncate \
diff --git a/edit/editcmd.c b/edit/editcmd.c
index 518dc5473..8de68eaaa 100644
--- a/edit/editcmd.c
+++ b/edit/editcmd.c
@@ -101,28 +101,6 @@ strcasechr (const char *s, int c)
     return s;
 }
 
-#ifndef HAVE_MEMMOVE
-/* for Christophe */
-static void *memmove (void *dest, const void *src, size_t n)
-{
-    char *t;
-    const char *s;
-
-    if (dest <= src) {
-	t = (char *) dest;
-	s = (const char *) src;
-	while (n--)
-	    *t++ = *s++;
-    } else {
-	t = (char *) dest + n;
-	s = (const char *) src + n;
-	while (n--)
-	    *--t = *--s;
-    }
-    return dest;
-}
-#endif /* !HAVE_MEMMOVE */
-
 /* #define itoa MY_itoa  <---- this line is now in edit.h */
 static char *
 MY_itoa (int i)
diff --git a/vfs/samba/include/includes.h b/vfs/samba/include/includes.h
index d0007e0f7..8824f5b05 100644
--- a/vfs/samba/include/includes.h
+++ b/vfs/samba/include/includes.h
@@ -647,10 +647,6 @@ extern int errno;
 char *strdup(const char *s);
 #endif
 
-#ifndef HAVE_MEMMOVE
-void *memmove(void *dest,const void *src,int size);
-#endif
-
 #ifndef HAVE_INITGROUPS
 int initgroups(char *name,gid_t id);
 #endif