diff --git a/src/add-ons/mail_daemon/inbound_protocols/imap/Jamfile b/src/add-ons/mail_daemon/inbound_protocols/imap/Jamfile
index 1ed16849c4..4a38d2b9ba 100644
--- a/src/add-ons/mail_daemon/inbound_protocols/imap/Jamfile
+++ b/src/add-ons/mail_daemon/inbound_protocols/imap/Jamfile
@@ -6,20 +6,23 @@ SubDirHdrs [ FDirName $(OBOS_TOP) headers os add-ons mail_daemon ] ;
 
 SubDirC++Flags -DBONE ;
 
-#OpenSSL testing should be automated somehow
-#SubDirC++Flags -DBONE -DUSESSL ;
-#SubDirHdrs [ FDirName / boot home config include ] ;
+if $(USESSL) {
+	SubDirC++Flags -DBONE -DUSESSL ;
+	SubDirHdrs [ FDirName / boot home config include ] ;
+}
 
 Addon IMAP : mail_daemon inbound_protocols :
 	imap_client.cpp
 	imap_config.cpp
 	NestedString.cpp ;
 
-LinkSharedOSLibs IMAP :
-	 be libmail.so socket bind ;
-
-#LinkSharedOSLibs IMAP :
-#	be libmail.so socket bind ssl crypto ;
+if $(USESSL) {
+	LinkSharedOSLibs IMAP :
+		be libmail.so socket bind ssl crypto ;
+} else {
+	LinkSharedOSLibs IMAP :
+		 be libmail.so socket bind ;
+}
 
 Package haiku-maildaemon-cvs :
 	IMAP : 
diff --git a/src/add-ons/mail_daemon/inbound_protocols/pop3/Jamfile b/src/add-ons/mail_daemon/inbound_protocols/pop3/Jamfile
index f4f8cf5810..5d10c6f55f 100644
--- a/src/add-ons/mail_daemon/inbound_protocols/pop3/Jamfile
+++ b/src/add-ons/mail_daemon/inbound_protocols/pop3/Jamfile
@@ -5,9 +5,10 @@ SubDirHdrs [ FDirName $(OBOS_TOP) headers os add-ons mail_daemon ] ;
 
 SubDirC++Flags -DBONE ;
 
-#OpenSSL testing should be automated somehow
-#SubDirC++Flags -DBONE -DUSESSL ;
-#SubDirHdrs [ FDirName / boot home config include ] ;
+if $(USESSL) {
+	SubDirC++Flags -DBONE -DUSESSL ;
+	SubDirHdrs [ FDirName / boot home config include ] ;
+}
 
 Addon POP3 : mail_daemon inbound_protocols :
 	MessageIO.cpp
@@ -15,11 +16,13 @@ Addon POP3 : mail_daemon inbound_protocols :
 	SimpleMailProtocol.cpp
 	md5c.c ;
 
-LinkSharedOSLibs POP3 :
-	 be libmail.so socket bind ;
-
-#LinkSharedOSLibs POP3 :
-#	be libmail.so socket bind ssl crypto ;
+if $(USESSL) {
+	LinkSharedOSLibs POP3 :
+		be libmail.so socket bind ssl crypto ;
+} else {
+	LinkSharedOSLibs POP3 :
+	 	be libmail.so socket bind ;
+}
 
 Package haiku-maildaemon-cvs :
 	POP3 :