diff --git a/pokerth_game.pro b/pokerth_game.pro
index 228b7828..80f07be5 100644
--- a/pokerth_game.pro
+++ b/pokerth_game.pro
@@ -361,15 +361,14 @@ mac{
 	LIBS += -framework SDL_mixer
 	# standard path for darwinports
 	# make sure you have a universal version of boost
-	LIBS += /opt/local/lib/libboost_thread-gcc40-mt-1_34.a
-	LIBS += /opt/local/lib/libboost_filesystem-gcc40-mt-1_34.a
+	LIBS += /usr/local/lib/libboost_thread-mt-1_34_1.a
+	LIBS += /usr/local/lib/libboost_filesystem-mt-1_34_1.a
 	# libraries installed on every mac
 	LIBS += -lcrypto -lz -framework Carbon
 	# 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.4u.sdk/usr/lib 
+	INCLUDEPATH += /Developer/SDKs/MacOSX10.4u.sdk/usr/include/
 	INCLUDEPATH += /Library/Frameworks/SDL.framework/Headers
 	INCLUDEPATH += /Library/Frameworks/SDL_mixer.framework/Headers
-	INCLUDEPATH += /opt/local/include
 }
diff --git a/pokerth_lib.pro b/pokerth_lib.pro
index 963ca323..60bbc23b 100644
--- a/pokerth_lib.pro
+++ b/pokerth_lib.pro
@@ -197,8 +197,7 @@ mac{
 	# 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.4u.sdk/usr/include/
 	INCLUDEPATH += /Library/Frameworks/SDL.framework/Headers
 	INCLUDEPATH += /Library/Frameworks/SDL_mixer.framework/Headers
-	INCLUDEPATH += /opt/local/include
 }
diff --git a/pokerth_server.pro b/pokerth_server.pro
index 1c778b86..f8c263be 100644
--- a/pokerth_server.pro
+++ b/pokerth_server.pro
@@ -209,13 +209,12 @@ mac{
 	LIBS += -lpokerth_lib
 	# standard path for darwinports
 	# make sure you have a universal version of boost
-	LIBS += /opt/local/lib/libboost_thread-gcc40-mt-1_34.a
-	LIBS += /opt/local/lib/libboost_filesystem-gcc40-mt-1_34.a
+	LIBS += /usr/local/lib/libboost_thread-mt-1_34_1.a
+	LIBS += /usr/local/lib/libboost_filesystem-mt-1_34_1.a
 	# libraries installed on every mac
 	LIBS += -lcrypto -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/
-	INCLUDEPATH += /opt/local/include
+	LIBPATH += /Developer/SDKs/MacOSX10.4u.sdk/usr/lib 
+	INCLUDEPATH += /Developer/SDKs/MacOSX10.4u.sdk/usr/include/
 }
diff --git a/src/core/linux/convhelper.cpp b/src/core/linux/convhelper.cpp
index 6955d711..ddb25f17 100644
--- a/src/core/linux/convhelper.cpp
+++ b/src/core/linux/convhelper.cpp
@@ -36,7 +36,11 @@ ConvHelper::NativeToUtf8(const std::string &inStr)
 {
 	string retStr(inStr);
 	size_t insize = inStr.length();
+#ifdef __APPLE__
+	const char *inbuf = inStr.data();
+#else
 	char *inbuf = const_cast<char *>(inStr.data());
+#endif
 
 	const size_t c_outsize = insize * 6; // max size of utf-8 char is 6 per input char
 	size_t outsize = c_outsize;
@@ -67,7 +71,11 @@ ConvHelper::Utf8ToNative(const std::string &inStr)
 {
 	string retStr(inStr);
 	size_t insize = inStr.length();
+#ifdef __APPLE__
+	const char *inbuf = inStr.data();
+#else
 	char *inbuf = const_cast<char *>(inStr.data());
+#endif
 
 	const size_t c_outsize = insize;
 	size_t outsize = c_outsize;