diff --git a/client/CMakeLists.txt b/client/CMakeLists.txt
index 00949d2e8..cb1d48e13 100644
--- a/client/CMakeLists.txt
+++ b/client/CMakeLists.txt
@@ -38,3 +38,7 @@ else()
 	# Build Windows Client
 	add_subdirectory(Windows)
 endif()
+
+if(APPLE)
+	add_subdirectory(Mac)
+endif()
diff --git a/client/Mac/CMakeLists.txt b/client/Mac/CMakeLists.txt
index 5a68674c5..98a9abaa9 100644
--- a/client/Mac/CMakeLists.txt
+++ b/client/Mac/CMakeLists.txt
@@ -1,6 +1,6 @@
 
 cmake_minimum_required (VERSION 2.8) 
-project (MacFreeRDP) 
+project (MacFreeRDP)
 set(CMAKE_COLOR_MAKEFILE ON)
 
 include(CheckIncludeFiles)
@@ -9,9 +9,6 @@ include(CheckStructHasMember)
 include(FindPkgConfig)
 include(TestBigEndian)
 
-# Include our extra modules
-set(CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/../../cmake/)
-
 include(AutoVersioning)
 include(ConfigOptions)
 include(FindOptionalPackage)
@@ -114,7 +111,8 @@ configure_file(${CMAKE_CURRENT_SOURCE_DIR}/Info.plist ${CMAKE_CURRENT_BINARY_DIR
 set_target_properties(MacFreeRDP PROPERTIES RESOURCE "${MacFreeRDP_XIBS}")
 
 # Automatic ref counting
-set_target_properties(MacFreeRDP PROPERTIES XCODE_ATTRIBUTE_CLANG_ENABLE_OBJC_ARC YES)
+# temporary turn off for x86_64 build issue
+# set_target_properties(MacFreeRDP PROPERTIES XCODE_ATTRIBUTE_CLANG_ENABLE_OBJC_ARC YES)
 
 # Support for automatic reference counting requires non-fragile abi.
 set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fobjc-nonfragile-abi")
@@ -135,12 +133,13 @@ if(NOT WIN32)
 	find_optional_package(MacAudio)
 endif()
 
-# Add all libraries
-target_link_libraries(MacFreeRDP ${EXTRA_LIBS})
-target_link_libraries(MacFreeRDP ${CMAKE_SOURCE_DIR}/../../xcode/libfreerdp-core/Debug/libfreerdp-core.dylib)
-target_link_libraries(MacFreeRDP ${CMAKE_SOURCE_DIR}/../../xcode/libfreerdp-channels/Debug/libfreerdp-channels.dylib)
-target_link_libraries(MacFreeRDP ${CMAKE_SOURCE_DIR}/../../xcode/libfreerdp-cache/Debug/libfreerdp-cache.dylib)
-target_link_libraries(MacFreeRDP ${CMAKE_SOURCE_DIR}/../../xcode/libfreerdp-gdi/Debug/libfreerdp-gdi.dylib)
-target_link_libraries(MacFreeRDP ${CMAKE_SOURCE_DIR}/../../xcode/libfreerdp-utils/Debug/libfreerdp-utils.dylib)
-target_link_libraries(MacFreeRDP ${CMAKE_SOURCE_DIR}/../../xcode/libfreerdp-codec/Debug/libfreerdp-codec.dylib)
-target_link_libraries(MacFreeRDP ${CMAKE_SOURCE_DIR}/../../xcode/libfreerdp-rail/Debug/libfreerdp-rail.dylib)
+target_link_libraries(MacFreeRDP
+			${EXTRA_LIBS}
+			freerdp-core
+			freerdp-channels
+			freerdp-cache
+			freerdp-gdi
+			freerdp-utils
+			freerdp-codec
+			freerdp-rail
+)
diff --git a/client/Mac/MRDPCursor.h b/client/Mac/MRDPCursor.h
index 98a2a08aa..3430e67c8 100644
--- a/client/Mac/MRDPCursor.h
+++ b/client/Mac/MRDPCursor.h
@@ -8,8 +8,6 @@
 
 #import <Cocoa/Cocoa.h>
 
-#define boolean int
-
 #include "freerdp/graphics.h"
 
 @interface MRDPCursor : NSObject
diff --git a/client/Mac/MRDPRailView.h b/client/Mac/MRDPRailView.h
index 396a67661..68b6f1256 100644
--- a/client/Mac/MRDPRailView.h
+++ b/client/Mac/MRDPRailView.h
@@ -1,7 +1,5 @@
 #import <Cocoa/Cocoa.h>
 
-#define boolean int
-
 #import "freerdp/gdi/gdi.h"
 #import "freerdp/rail/rail.h"
 #import "MRDPRailWindow.h"
diff --git a/client/Mac/MRDPRailView.m b/client/Mac/MRDPRailView.m
index ed380e6b1..69e08200b 100644
--- a/client/Mac/MRDPRailView.m
+++ b/client/Mac/MRDPRailView.m
@@ -746,7 +746,7 @@ extern struct kkey g_keys[];
     //if ([self activateWindow])
         mac_rail_send_activate(savedWindowId);
     
-    set_current_window(windowIndex);
+    // set_current_window(windowIndex); // ? code mis-merge?
 }
 
 - (void) releaseResources
diff --git a/client/Mac/MRDPView.h b/client/Mac/MRDPView.h
index fe8b8cbbf..48a3aac4d 100644
--- a/client/Mac/MRDPView.h
+++ b/client/Mac/MRDPView.h
@@ -8,8 +8,6 @@
 
 #import <Cocoa/Cocoa.h>
 
-typedef int boolean;
-
 #import "MRDPWindow.h"
 #import "freerdp/freerdp.h"
 #import "freerdp/types.h"
diff --git a/client/Mac/MRDPView.m b/client/Mac/MRDPView.m
index 757e55be0..722a7d21e 100644
--- a/client/Mac/MRDPView.m
+++ b/client/Mac/MRDPView.m
@@ -1869,7 +1869,6 @@ void cliprdr_send_supported_format_list(freerdp *inst)
     freerdp_channels_send_event(inst->context->channels, (RDP_EVENT*) event);
 }
 
-<<<<<<< HEAD
 /****************************************************************************************
  *                                                                                      *
  *                                                                                      *