diff --git a/src/add-ons/mail_daemon/inbound_protocols/imap/Jamfile b/src/add-ons/mail_daemon/inbound_protocols/imap/Jamfile
index 4a38d2b9ba..e5200ff1a5 100644
--- a/src/add-ons/mail_daemon/inbound_protocols/imap/Jamfile
+++ b/src/add-ons/mail_daemon/inbound_protocols/imap/Jamfile
@@ -4,10 +4,14 @@ UsePrivateHeaders mail ;
 
 SubDirHdrs [ FDirName $(OBOS_TOP) headers os add-ons mail_daemon ] ;
 
-SubDirC++Flags -DBONE ;
+if $(TARGET_PLATFORM) = r5 {
+	SubDirC++Flags -DBUILDING_R5_LIBNET ;
+} else {
+	SubDirC++Flags -DBONE ;
+}
 
 if $(USESSL) {
-	SubDirC++Flags -DBONE -DUSESSL ;
+	SubDirC++Flags -DUSESSL ;
 	SubDirHdrs [ FDirName / boot home config include ] ;
 }
 
@@ -19,6 +23,9 @@ Addon IMAP : mail_daemon inbound_protocols :
 if $(USESSL) {
 	LinkSharedOSLibs IMAP :
 		be libmail.so socket bind ssl crypto ;
+} else if $(TARGET_PLATFORM) = r5 {
+	LinkSharedOSLibs IMAP :
+		 be libmail.so net ;
 } else {
 	LinkSharedOSLibs IMAP :
 		 be libmail.so socket bind ;
diff --git a/src/add-ons/mail_daemon/inbound_protocols/imap/imap_client.cpp b/src/add-ons/mail_daemon/inbound_protocols/imap/imap_client.cpp
index c0b20b863f..f152a47790 100644
--- a/src/add-ons/mail_daemon/inbound_protocols/imap/imap_client.cpp
+++ b/src/add-ons/mail_daemon/inbound_protocols/imap/imap_client.cpp
@@ -19,14 +19,10 @@
 #include <unistd.h>
 #include <ctype.h>
 
-#ifdef BONE
-	#include <sys/socket.h>
-	#include <arpa/inet.h>
-	#include <sys/time.h>
-	#include <sys/select.h>
-#else
-	#include <socket.h>
-#endif
+#include <sys/socket.h>
+#include <arpa/inet.h>
+#include <sys/time.h>
+#include <sys/select.h>
 
 #ifdef USESSL
 	#include <openssl/ssl.h>
@@ -158,7 +154,11 @@ IMAP4Client::IMAP4Client(BMessage *settings, BMailChainRunner *run) : BRemoteMai
 		return;
 	}
 	
+#ifdef BONE
 	net = socket(AF_INET, SOCK_STREAM, 0);
+#else
+	net = socket(AF_INET, 2, 0);
+#endif
 	if (net >= 0) {
 		struct sockaddr_in saAddr;
 		memset(&saAddr, 0, sizeof(saAddr));
diff --git a/src/add-ons/mail_daemon/inbound_protocols/pop3/Jamfile b/src/add-ons/mail_daemon/inbound_protocols/pop3/Jamfile
index 5d10c6f55f..1af760b6fa 100644
--- a/src/add-ons/mail_daemon/inbound_protocols/pop3/Jamfile
+++ b/src/add-ons/mail_daemon/inbound_protocols/pop3/Jamfile
@@ -3,10 +3,14 @@ SubDir OBOS_TOP src add-ons mail_daemon inbound_protocols pop3 ;
 UsePrivateHeaders mail ;
 SubDirHdrs [ FDirName $(OBOS_TOP) headers os add-ons mail_daemon ] ;
 
-SubDirC++Flags -DBONE ;
+if $(TARGET_PLATFORM) = r5 {
+	SubDirC++Flags -DBUILDING_R5_LIBNET ;
+} else {
+	SubDirC++Flags -DBONE ;
+}
 
 if $(USESSL) {
-	SubDirC++Flags -DBONE -DUSESSL ;
+	SubDirC++Flags -DUSESSL ;
 	SubDirHdrs [ FDirName / boot home config include ] ;
 }
 
@@ -19,9 +23,12 @@ Addon POP3 : mail_daemon inbound_protocols :
 if $(USESSL) {
 	LinkSharedOSLibs POP3 :
 		be libmail.so socket bind ssl crypto ;
+} else if $(TARGET_PLATFORM) = r5 {
+	LinkSharedOSLibs POP3 :
+		 be libmail.so net ;
 } else {
 	LinkSharedOSLibs POP3 :
-	 	be libmail.so socket bind ;
+		 be libmail.so socket bind ;
 }
 
 Package haiku-maildaemon-cvs :
diff --git a/src/add-ons/mail_daemon/inbound_protocols/pop3/pop3.cpp b/src/add-ons/mail_daemon/inbound_protocols/pop3/pop3.cpp
index c35ae4cd71..e6f033cfe6 100644
--- a/src/add-ons/mail_daemon/inbound_protocols/pop3/pop3.cpp
+++ b/src/add-ons/mail_daemon/inbound_protocols/pop3/pop3.cpp
@@ -22,12 +22,8 @@
 #include <MDRLanguage.h>
 
 
-#ifdef BONE
-	#include <sys/socket.h>
-	#include <arpa/inet.h>
-#else
-	#include <socket.h>
-#endif
+#include <sys/socket.h>
+#include <arpa/inet.h>
 
 #if USESSL
 	#include <openssl/ssl.h>
@@ -108,7 +104,11 @@ POP3Protocol::Open(const char *server, int port, int)
 		return B_NAME_NOT_FOUND;
 	}
 	
+#ifdef BONE
 	conn = socket(AF_INET, SOCK_STREAM, 0);
+#else
+	conn = socket(AF_INET, 2, 0);
+#endif
 	if (conn >= 0) {
 		struct sockaddr_in saAddr;
 		memset(&saAddr, 0, sizeof(saAddr));
diff --git a/src/add-ons/mail_daemon/outbound_protocols/smtp/Jamfile b/src/add-ons/mail_daemon/outbound_protocols/smtp/Jamfile
index d102c76f1b..6fb30efdd0 100644
--- a/src/add-ons/mail_daemon/outbound_protocols/smtp/Jamfile
+++ b/src/add-ons/mail_daemon/outbound_protocols/smtp/Jamfile
@@ -3,14 +3,23 @@ SubDir OBOS_TOP src add-ons mail_daemon outbound_protocols smtp ;
 UsePrivateHeaders mail ;
 SubDirHdrs [ FDirName $(OBOS_TOP) headers os add-ons mail_daemon ] ;
 
-SubDirC++Flags -DBONE ;
+if $(TARGET_PLATFORM) = r5 {
+	SubDirC++Flags -DBUILDING_R5_LIBNET ;
+} else {
+	SubDirC++Flags -DBONE ;
+}
 
 Addon SMTP : mail_daemon outbound_protocols :
 	smtp.cpp
 	md5c.c ;
 
-LinkSharedOSLibs SMTP :
-	 be libmail.so socket bind ;
+if $(TARGET_PLATFORM) = r5 {
+	LinkSharedOSLibs SMTP :
+		 be libmail.so net ;
+} else {
+	LinkSharedOSLibs SMTP :
+		 be libmail.so socket bind ;
+}
 
 Package haiku-maildaemon-cvs :
 	SMTP : 
diff --git a/src/add-ons/mail_daemon/outbound_protocols/smtp/smtp.cpp b/src/add-ons/mail_daemon/outbound_protocols/smtp/smtp.cpp
index 612781ed63..39776c4c87 100644
--- a/src/add-ons/mail_daemon/outbound_protocols/smtp/smtp.cpp
+++ b/src/add-ons/mail_daemon/outbound_protocols/smtp/smtp.cpp
@@ -29,14 +29,10 @@
 
 #include <MDRLanguage.h>
 
-#ifdef BONE
-	#include <sys/socket.h>
-	#include <sys/time.h>
-	#include <sys/select.h>
-	#include <arpa/inet.h>
-#else
-	#include <socket.h>
-#endif
+#include <sys/socket.h>
+#include <sys/time.h>
+#include <sys/select.h>
+#include <arpa/inet.h>
 
 #define CRLF "\r\n"
 #define SMTP_RESPONSE_SIZE 8192
@@ -181,7 +177,11 @@ SMTPProtocol::Open(const char *address, int port, bool esmtp)
 	if (hostIP == 0)
 		return EHOSTUNREACH;
 		
+#ifdef BONE
 	_fd = socket(AF_INET, SOCK_STREAM, 0);
+#else
+	_fd = socket(AF_INET, 2, 0);
+#endif
 	if (_fd >= 0) {
 		struct sockaddr_in saAddr;
 		memset(&saAddr, 0, sizeof(saAddr));