diff --git a/CMakeLists.txt b/CMakeLists.txt
index 7dc7a9743..de2c6b8d3 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -63,6 +63,12 @@ include_directories(${CMAKE_SOURCE_DIR}/include)
 # Configure files
 configure_file(${CMAKE_CURRENT_SOURCE_DIR}/config.h.in ${CMAKE_CURRENT_BINARY_DIR}/config.h)
 
+# Mac OS X
+if(APPLE)
+	include_directories(/opt/local/include)
+	link_directories(/opt/local/lib)
+endif()
+
 # Build CUnit
 find_package(CUnit)
 if(CUNIT_FOUND)
diff --git a/cunit/test_freerdp.h b/cunit/test_freerdp.h
index f1068f4df..436e959b0 100644
--- a/cunit/test_freerdp.h
+++ b/cunit/test_freerdp.h
@@ -20,7 +20,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <CUnit/Basic.h>
+#include <CUnit/CUnit.h>
 #include <freerdp/types/base.h>
 #include <freerdp/utils/stream.h>
 #include <freerdp/utils/hexdump.h>
diff --git a/libfreerdp-core/CMakeLists.txt b/libfreerdp-core/CMakeLists.txt
index 9209a7457..2cfeb630d 100644
--- a/libfreerdp-core/CMakeLists.txt
+++ b/libfreerdp-core/CMakeLists.txt
@@ -49,5 +49,6 @@ set(LIBFREERDP_CORE_SRCS
 add_library(freerdp-core SHARED ${LIBFREERDP_CORE_SRCS})
 
 target_link_libraries(freerdp-core ssl)
+target_link_libraries(freerdp-core freerdp-utils)
 
 install(TARGETS freerdp-core DESTINATION lib)
diff --git a/libfreerdp-core/transport.c b/libfreerdp-core/transport.c
index c10393def..6c11428dc 100644
--- a/libfreerdp-core/transport.c
+++ b/libfreerdp-core/transport.c
@@ -32,6 +32,10 @@
 #include "tpkt.h"
 #include "transport.h"
 
+#ifndef MSG_NOSIGNAL
+#define MSG_NOSIGNAL 0
+#endif
+
 #define BUFFER_SIZE 16384
 
 boolean