diff --git a/client/Mac/CMakeLists.txt b/client/Mac/CMakeLists.txt
index 3be209d98..939db77ea 100644
--- a/client/Mac/CMakeLists.txt
+++ b/client/Mac/CMakeLists.txt
@@ -9,21 +9,15 @@ find_required_package(OpenSSL)
 set(FRAMEWORK_HEADERS_PATH /System/Library/Frameworks/Cocoa.framework/Versions/A/Headers/)
 include_directories(${FRAMEWORK_HEADERS_PATH} /System/Library/Frameworks) 
 	
-# set(CMAKE_OSX_SYSROOT MacOSX10.7.sdk) # uncomment to specify SDK version
+# set(CMAKE_OSX_SYSROOT MacOSX10.7.sdk)
 set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -mmacosx-version-min=10.4")
 set(GUI_TYPE MACOSX_BUNDLE)
 	
 # Import libraries
 find_library(FOUNDATION_LIBRARY Foundation)
-message("+ Using foundation library ${FOUNDATION_LIBRARY}")
 find_library(COCOA_LIBRARY Cocoa)
-message("+ Using cocoa library ${COCOA_LIBRARY}")
 find_library(APPKIT_LIBRARY AppKit)
-message("+ Using appkit library ${APPKIT_LIBRARY}")
-	
-message(" Current source dir: ${CMAKE_CURRENT_SOURCE_DIR}")
-# Set the OS X Bundle specific CMake variables which will be used to populate the plist for
-# the application bundle
+
 set(MACOSX_BUNDLE_INFO_STRING "MacFreeRDP")
 set(MACOSX_BUNDLE_GUI_IDENTIFIER "com.freerdp.mac")
 set(MACOSX_BUNDLE_BUNDLE_IDENTIFIER "FreeRDP.Mac")
@@ -33,7 +27,6 @@ set(MACOSX_BUNDLE_SHORT_VERSION_STRING 1.0.1)
 set(MACOSX_BUNDLE_BUNDLE_VERSION 1.0.1)
 set(MACOSX_BUNDLE_COPYRIGHT "Copyright 2012. All Rights Reserved.")
 
-# Specific plist and NOT standard CMake variables
 set(MACOSX_BUNDLE_NSMAIN_NIB_FILE "MainMenu")
 set(MACOSX_BUNDLE_NSPRINCIPAL_CLASS "NSApplication")
 	
@@ -91,6 +84,10 @@ set_complex_link_libraries(VARIABLE ${MODULE_PREFIX}_LIBS MONOLITHIC ${MONOLITHI
 	MODULE freerdp
 	MODULES freerdp-core freerdp-cache freerdp-gdi freerdp-codec freerdp-rail freerdp-utils)
 
+set_complex_link_libraries(VARIABLE ${MODULE_PREFIX}_LIBS MONOLITHIC ${MONOLITHIC_BUILD}
+	MODULE winpr
+	MODULES winpr-crt)
+
 target_link_libraries(${MODULE_NAME} ${${MODULE_PREFIX}_LIBS})
 
 set_property(TARGET MacFreeRDP PROPERTY FOLDER "Client/Mac")
diff --git a/client/Mac/README.txt b/client/Mac/README.txt
index e523d02b4..39fe93f73 100644
--- a/client/Mac/README.txt
+++ b/client/Mac/README.txt
@@ -103,7 +103,7 @@ This is what your AppDelegate.m file should like like
  Modifying your MainMenu.xib file
 ----------------------------------
 
-In your project select MainMenu.xib and drag a NSView  object intot the main window
+In your project select MainMenu.xib and drag a NSView  object into the main window
 Name the class MRDPView
 In Interface Builder, select the Application Delegate and tie the mrdpview outlet to the NSView 
 Set the default size of the main window to 1024x768. This is FreeRDP's default resolution
diff --git a/server/Mac/.gitignore b/server/Mac/.gitignore
new file mode 100644
index 000000000..62d3dab88
--- /dev/null
+++ b/server/Mac/.gitignore
@@ -0,0 +1,2 @@
+mfreerdp-server
+
diff --git a/server/Mac/mfreerdp-server b/server/Mac/mfreerdp-server
deleted file mode 100755
index e0e450da6..000000000
Binary files a/server/Mac/mfreerdp-server and /dev/null differ