diff --git a/CMakeLists.txt b/CMakeLists.txt
index 3ee222e56..840a20581 100755
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -227,6 +227,12 @@ if(APPLE)
                 set(CMAKE_FIND_ROOT_PATH ${CMAKE_FIND_ROOT_PATH} ${FREERDP_IOS_EXTERNAL_SSL_PATH})
         	set_property(GLOBAL PROPERTY XCODE_ATTRIBUTE_SKIP_INSTALL YES)
 	else()
+		set(CMAKE_OSX_DEPLOYMENT_TARGET 10.6)
+
+		if(NOT DEFINED CMAKE_OSX_ARCHITECTURES)
+			set(CMAKE_OSX_ARCHITECTURES i386 x86_64)
+		endif()
+
                 if(IS_DIRECTORY /opt/local/include)
                         include_directories(/opt/local/include)
                         link_directories(/opt/local/lib)
diff --git a/client/Mac/CMakeLists.txt b/client/Mac/CMakeLists.txt
index a556fd071..2344f46a1 100755
--- a/client/Mac/CMakeLists.txt
+++ b/client/Mac/CMakeLists.txt
@@ -157,7 +157,7 @@ endif()
 						 
 		add_custom_command (TARGET ${MODULE_NAME} POST_BUILD 
 			COMMAND ${IBTOOL} --errors --warnings --notices --output-format human-readable-text 
-				--compile ${CMAKE_CURRENT_BINARY_DIR}/$(CONFIGURATION)/${MODULE_OUTPUT_NAME}.framework/Versions/${MACOSX_BUNDLE_SHORT_VERSION_STRING}/Resources/${XIB_WE}.nib ${xib}
+				--compile ${CMAKE_CURRENT_BINARY_DIR}/$(CONFIGURATION)/${MODULE_OUTPUT_NAME}.framework/Versions/${MACOSX_BUNDLE_SHORT_VERSION_STRING}/Resources/${XIB_WE}.nib ${CMAKE_CURRENT_SOURCE_DIR}/${xib}
 			COMMENT "Compiling ${xib}")
 	endforeach()
 # endif()
diff --git a/client/Mac/cli/CMakeLists.txt b/client/Mac/cli/CMakeLists.txt
index 2d14e370a..e8033e2f5 100644
--- a/client/Mac/cli/CMakeLists.txt
+++ b/client/Mac/cli/CMakeLists.txt
@@ -105,7 +105,7 @@ if("${CMAKE_GENERATOR}" MATCHES "Unix Makefiles")
 						 
 		add_custom_command (TARGET ${MODULE_NAME} POST_BUILD 
 			COMMAND ${IBTOOL} --errors --warnings --notices --output-format human-readable-text 
-				--compile ${CMAKE_CURRENT_BINARY_DIR}/\${CONFIGURATION}/${MODULE_OUTPUT_NAME}.app/Contents/Resources/${XIB_WE}.nib ${xib}
+				--compile ${CMAKE_CURRENT_BINARY_DIR}/\${CONFIGURATION}/${MODULE_OUTPUT_NAME}.app/Contents/Resources/${XIB_WE}.nib ${CMAKE_CURRENT_SOURCE_DIR}/${xib}
 			COMMENT "Compiling ${xib}")
 	endforeach()
 
diff --git a/winpr/include/winpr/spec.h b/winpr/include/winpr/spec.h
index 37b80f08f..917e8af82 100644
--- a/winpr/include/winpr/spec.h
+++ b/winpr/include/winpr/spec.h
@@ -53,7 +53,7 @@
 #endif
 
 #ifndef DECLSPEC_NORETURN
-#if (defined(__GNUC__) || defined(_MSC_VER))
+#if (defined(__GNUC__) || defined(_MSC_VER) || defined(__clang__))
 #define DECLSPEC_NORETURN __declspec(noreturn)
 #else
 #define DECLSPEC_NORETURN
diff --git a/winpr/libwinpr/thread/process.c b/winpr/libwinpr/thread/process.c
index b5cc87858..76c4f127e 100644
--- a/winpr/libwinpr/thread/process.c
+++ b/winpr/libwinpr/thread/process.c
@@ -87,7 +87,7 @@ BOOL CreateProcessAsUserW(HANDLE hToken, LPCWSTR lpApplicationName, LPWSTR lpCom
 	return TRUE;
 }
 
-VOID ExitProcess(UINT uExitCode)
+DECLSPEC_NORETURN VOID ExitProcess(UINT uExitCode)
 {
 
 }