diff --git a/src/tools/remote_disk_server/Jamfile b/src/tools/remote_disk_server/Jamfile
index fcfb149c2a..91ad3a76a3 100644
--- a/src/tools/remote_disk_server/Jamfile
+++ b/src/tools/remote_disk_server/Jamfile
@@ -4,5 +4,5 @@ UsePrivateHeaders kernel ;
 
 BuildPlatformMain remote_disk_server
 	: remote_disk_server.cpp
-	: $(HOST_LIBSUPC++)
+	: $(HOST_LIBSUPC++) $(NETWORK_LIBS)
 ;
diff --git a/src/tools/remote_disk_server/remote_disk_server.cpp b/src/tools/remote_disk_server/remote_disk_server.cpp
index 949b706b88..408f8175fb 100644
--- a/src/tools/remote_disk_server/remote_disk_server.cpp
+++ b/src/tools/remote_disk_server/remote_disk_server.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright 2005, Ingo Weinhold <bonefish@cs.tu-berlin.de>.
+ * Copyright 2005-2007, Ingo Weinhold <bonefish@cs.tu-berlin.de>.
  * All rights reserved. Distributed under the terms of the MIT License.
  */
 
@@ -8,7 +8,6 @@
 #include <fcntl.h>
 #include <stdio.h>
 #include <stdlib.h>
-#include <stdint.h>
 #include <string.h>
 #include <unistd.h>
 #include <netinet/in.h>
@@ -17,6 +16,13 @@
 
 #include <boot/net/RemoteDiskDefs.h>
 
+#if defined(__BEOS__) && !defined(__HAIKU__)
+#	include <limits.h>
+typedef int socklen_t;
+#else
+#	include <stdint.h>
+#endif
+
 
 #if __BYTE_ORDER == __LITTLE_ENDIAN