diff --git a/chatcleaner.pro b/chatcleaner.pro
index eb3a8471..596c97fa 100644
--- a/chatcleaner.pro
+++ b/chatcleaner.pro
@@ -54,11 +54,12 @@ win32 {
 	INCLUDEPATH += $${PREFIX}/include
 }
 mac {
-	# make it universal
-	CONFIG += x86
-	CONFIG -= ppc
-	QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.5
-	QMAKE_CXXFLAGS -= -std=gnu++0x
+        # make it x86_64 only
+        CONFIG += x86_64
+        CONFIG -= x86
+        CONFIG -= ppc
+        QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.6
+        QMAKE_CXXFLAGS -= -std=gnu++0x
 	LIBPATH += /Developer/SDKs/MacOSX10.5.sdk/usr/lib
-	INCLUDEPATH += /Developer/SDKs/MacOSX10.5.sdk/usr/include/
+        INCLUDEPATH += /Developer/SDKs/MacOSX10.6.sdk/usr/include/
 }
diff --git a/pokerth_db.pro b/pokerth_db.pro
index 30fa9f27..3981cbd8 100644
--- a/pokerth_db.pro
+++ b/pokerth_db.pro
@@ -54,17 +54,18 @@ win32{
 }
 
 mac{
-	# make it universal  
-	CONFIG += x86
-	CONFIG -= ppc
-	QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.5
-	QMAKE_CXXFLAGS -= -std=gnu++0x
+        # make it x86_64 only
+        CONFIG += x86_64
+        CONFIG -= x86
+        CONFIG -= ppc
+        QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.6
+        QMAKE_CXXFLAGS -= -std=gnu++0x
 
 	# for universal-compilation on PPC-Mac uncomment the following line
 	# on Intel-Mac you have to comment this line out or build will fail.
 	#	QMAKE_MAC_SDK=/Developer/SDKs/MacOSX10.4u.sdk/
 
-	INCLUDEPATH += /Developer/SDKs/MacOSX10.5.sdk/usr/include/
+        INCLUDEPATH += /Developer/SDKs/MacOSX10.6.sdk/usr/include/
 	INCLUDEPATH += /Library/Frameworks/SDL.framework/Headers
 	INCLUDEPATH += /Library/Frameworks/SDL_mixer.framework/Headers
 }
diff --git a/pokerth_game.pro b/pokerth_game.pro
index faee134c..3bb9b0a7 100644
--- a/pokerth_game.pro
+++ b/pokerth_game.pro
@@ -489,10 +489,11 @@ unix:!mac {
 		desktop
 }
 mac { 
-	# make it universal
-	CONFIG += x86
-	CONFIG -= ppc
-	QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.5
+        # make it x86_64 only
+        CONFIG += x86_64
+        CONFIG -= x86
+        CONFIG -= ppc
+        QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.6
 	QMAKE_CXXFLAGS -= -std=gnu++0x
 
 	# workaround for problems with boost_filesystem exceptions
@@ -515,8 +516,7 @@ mac {
 	LIBS += -framework \
 		SDL_mixer
 
-	# standard path for darwinports
-	# make sure you have a universal version of boost
+        # make sure you have an x86_64 version of boost
 	LIBS += /usr/local/lib/libboost_thread.a
 	LIBS += /usr/local/lib/libboost_filesystem.a
 	LIBS += /usr/local/lib/libboost_regex.a
@@ -536,8 +536,8 @@ mac {
 
 	# set the application icon
 	RC_FILE = pokerth.icns
-	LIBPATH += /Developer/SDKs/MacOSX10.5.sdk/usr/lib
-	INCLUDEPATH += /Developer/SDKs/MacOSX10.5.sdk/usr/include/
+        LIBPATH += /Developer/SDKs/MacOSX10.6.sdk/usr/lib
+        INCLUDEPATH += /Developer/SDKs/MacOSX10.6.sdk/usr/include/
 	INCLUDEPATH += /Library/Frameworks/SDL.framework/Headers
 	INCLUDEPATH += /Library/Frameworks/SDL_mixer.framework/Headers
 }
diff --git a/pokerth_lib.pro b/pokerth_lib.pro
index b339fe2e..18ef2c78 100644
--- a/pokerth_lib.pro
+++ b/pokerth_lib.pro
@@ -226,17 +226,18 @@ win32{
 }
 
 mac{
-	# make it universal  
-	CONFIG += x86
-	CONFIG -= ppc
-	QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.5
-	QMAKE_CXXFLAGS -= -std=gnu++0x
+        # make it x86_64 only
+        CONFIG += x86_64
+        CONFIG -= x86
+        CONFIG -= ppc
+        QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.6
+        QMAKE_CXXFLAGS -= -std=gnu++0x
 
 	# for universal-compilation on PPC-Mac uncomment the following line
 	# on Intel-Mac you have to comment this line out or build will fail.
 	#	QMAKE_MAC_SDK=/Developer/SDKs/MacOSX10.4u.sdk/
 
-	INCLUDEPATH += /Developer/SDKs/MacOSX10.5.sdk/usr/include/
+        INCLUDEPATH += /Developer/SDKs/MacOSX10.6.sdk/usr/include/
 	INCLUDEPATH += /Library/Frameworks/SDL.framework/Headers
 	INCLUDEPATH += /Library/Frameworks/SDL_mixer.framework/Headers
 	INCLUDEPATH += /opt/local/include
diff --git a/pokerth_protocol.pro b/pokerth_protocol.pro
index a1048d9e..51af4313 100644
--- a/pokerth_protocol.pro
+++ b/pokerth_protocol.pro
@@ -340,15 +340,16 @@ win32 {
 	DEFINES += _WIN32_WINNT=0x0501
 }
 mac { 
-	# make it universal
-	CONFIG += x86
-	CONFIG -= ppc
-	QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.5
+        # make it x86_64 only
+        CONFIG += x86_64
+        CONFIG -= x86
+        CONFIG -= ppc
+        QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.6
 
 	# for universal-compilation on PPC-Mac uncomment the following line
 	# on Intel-Mac you have to comment this line out or build will fail.
 	# QMAKE_MAC_SDK=/Developer/SDKs/MacOSX10.4u.sdk/
-	INCLUDEPATH += /Developer/SDKs/MacOSX10.5.sdk/usr/include/
+        INCLUDEPATH += /Developer/SDKs/MacOSX10.6.sdk/usr/include/
 	INCLUDEPATH += /Library/Frameworks/SDL.framework/Headers
 	INCLUDEPATH += /Library/Frameworks/SDL_mixer.framework/Headers
 }
diff --git a/pokerth_server.pro b/pokerth_server.pro
index 7a4bf504..5ee17e2d 100644
--- a/pokerth_server.pro
+++ b/pokerth_server.pro
@@ -295,10 +295,11 @@ unix : !mac {
 }
 
 mac {
-	# make it universal
-	CONFIG += x86
+        # make it x86_64 only
+        CONFIG += x86_64
+        CONFIG -= x86
 	CONFIG -= ppc
-	QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.5
+        QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.6
 	QMAKE_CXXFLAGS -= -std=gnu++0x
 
 	# workaround for problems with boost_filesystem exceptions
@@ -309,9 +310,8 @@ mac {
 	#       QMAKE_MAC_SDK=/Developer/SDKs/MacOSX10.4u.sdk/
 
 	LIBPATH += lib
-	# standard path for darwinports
-	# make sure you have a universal version of boost
-	LIBS += /usr/local/lib/libboost_thread.a
+        # make sure you have an x86_64 version of boost
+        LIBS += /usr/local/lib/libboost_thread.a
 	LIBS += /usr/local/lib/libboost_filesystem.a
 	LIBS += /usr/local/lib/libboost_regex.a
 	LIBS += /usr/local/lib/libboost_random.a
@@ -326,8 +326,8 @@ mac {
 	LIBS += -lcrypto -lssl -lz -liconv
 	# set the application icon
 	RC_FILE = pokerth.icns
-	LIBPATH += /Developer/SDKs/MacOSX10.5.sdk/usr/lib
-	INCLUDEPATH += /Developer/SDKs/MacOSX10.5.sdk/usr/include/
+        LIBPATH += /Developer/SDKs/MacOSX10.6.sdk/usr/lib
+        INCLUDEPATH += /Developer/SDKs/MacOSX10.6.sdk/usr/include/
 }
 
 official_server {