diff --git a/cpukit/ChangeLog b/cpukit/ChangeLog
index ff44b0d7a2..b08c303d3f 100644
--- a/cpukit/ChangeLog
+++ b/cpukit/ChangeLog
@@ -1,3 +1,9 @@
+2007-06-21	Joel Sherrill <joel.sherrill@OARcorp.com>
+
+	* libnetworking/rtems/rtems_syscall.c: Remove RTEMS versions of send()
+	and recv(). We already had the BSD versions and these conflict
+	sometimes when linking.
+
 2007-06-21	Joel Sherrill <joel.sherrill@OARcorp.com>
 
 	* libnetworking/rtems/mkrootfs.h, libnetworking/rtems/rtems_bsdnet.h,
diff --git a/cpukit/libnetworking/rtems/rtems_syscall.c b/cpukit/libnetworking/rtems/rtems_syscall.c
index d43d24dc7d..640500efa2 100644
--- a/cpukit/libnetworking/rtems/rtems_syscall.c
+++ b/cpukit/libnetworking/rtems/rtems_syscall.c
@@ -32,11 +32,18 @@
 #include <net/if.h>
 #include <net/route.h>
 
+/*
+ *  Since we are "in the kernel", these do not get prototyped in sys/socket.h
+ */
+ssize_t	send(int, const void *, size_t, int);
+ssize_t	recv(int, void *, size_t, int);
+
 /*
  * Hooks to RTEMS I/O system
  */
 static const rtems_filesystem_file_handlers_r socket_handlers;
-int rtems_bsdnet_makeFdForSocket(void *so, const rtems_filesystem_file_handlers_r *h);
+int rtems_bsdnet_makeFdForSocket(
+    void *so, const rtems_filesystem_file_handlers_r *h);
 struct socket *rtems_bsdnet_fdToSocket(int fd);
 
 /*
@@ -373,15 +380,6 @@ sendto (int s, const void *buf, size_t buflen, int flags, const struct sockaddr
 	return sendmsg (s, &msg, flags);
 }
 
-/*
- * Send a message to a connected host
- */
-ssize_t
-send (int s, const void *buf, size_t buflen, int flags)
-{
-	return sendto (s, buf, buflen, flags, NULL, 0);
-}
-
 /*
  * All `receive' operations end up calling this routine.
  */
@@ -503,15 +501,6 @@ recvfrom (int s, void *buf, size_t buflen, int flags, const struct sockaddr *fro
 	return ret;
 }
 
-/*
- * Receive a message from a connected host
- */
-ssize_t
-recv (int s, void *buf, size_t buflen, int flags)
-{
-	return recvfrom (s, buf, buflen, flags, NULL, NULL);
-}
-
 int
 setsockopt (int s, int level, int name, const void *val, int len)
 {