diff --git a/src/build/compile.sh b/src/build/compile.sh
index caa682cca..aa4d7273a 100755
--- a/src/build/compile.sh
+++ b/src/build/compile.sh
@@ -51,7 +51,7 @@ elif [ "$1" == "mac" ]; then
 	[ -z "$march" ] && march=prescott;
 	[ -z "$mtune" ] && mtune=generic;
 	[ -z "$CFLAGS" ] && CFLAGS="-m32 -arch i386 -fomit-frame-pointer";
-	[ -z "$LDFLAGS" ] && LDFLAGS=" ";
+	[ -z "$LDFLAGS" ] && LDFLAGS="-Wl,-rpath,@loader_path/../lib";
 	export RPATH="@executable_path/../lib"
 	OPENSSL_TARGET="darwin-i386-cc"
 	echo "[INFO] Compiling for Intel MacOS x86"
@@ -59,8 +59,7 @@ elif [ "$1" == "mac64" ]; then
 	[ -z "$march" ] && march=core2;
 	[ -z "$mtune" ] && mtune=generic;
 	[ -z "$CFLAGS" ] && CFLAGS="-m64 -arch x86_64 -fomit-frame-pointer";
-	[ -z "$LDFLAGS" ] && LDFLAGS=" ";
-	export RPATH="@executable_path/../lib"
+	[ -z "$LDFLAGS" ] && LDFLAGS="-Wl,-rpath,@loader_path/../lib";
 	OPENSSL_TARGET="darwin64-x86_64-cc"
 	echo "[INFO] Compiling for Intel MacOS x86_64"
 elif [ "$1" == "ios" ]; then
diff --git a/src/build/installer.sh b/src/build/installer.sh
index e19ccbc0e..b1844d413 100644
--- a/src/build/installer.sh
+++ b/src/build/installer.sh
@@ -2,7 +2,8 @@
 PMMP_VERSION=""
 LINUX_32_BUILD="PHP_5.5.9_x86_Linux"
 LINUX_64_BUILD="PHP_5.5.9_x86-64_Linux"
-MAC_BUILD="PHP_5.5.9_x86-64_MacOS"
+MAC_32_BUILD="PHP_5.5.9_x86_MacOS"
+MAC_64_BUILD="PHP_5.5.9_x86-64_MacOS"
 RPI_BUILD="PHP_5.5.9_ARM_Raspbian_hard"
 # Temporal build
 ODROID_BUILD="PHP_5.5.9_ARM_Raspbian_hard"
@@ -101,7 +102,13 @@ else
 			fi
 		else
 			rm -r -f bin/ >> /dev/null 2>&1
-			echo -n "[3/3] Mac OSX PHP build available, downloading $MAC_BUILD.tar.gz..."
+			if [ `getconf LONG_BIT` = "64" ]; then
+				echo -n "[3/3] MacOS 64-bit PHP build available, downloading $MAC_64_BUILD.tar.gz..."
+				MAC_BUILD=$MAC_64_BUILD
+			else
+				echo -n "[3/3] MacOS 32-bit PHP build available, downloading $MAC_32_BUILD.tar.gz..."
+				MAC_BUILD=$MAC_32_BUILD
+			fi
 			download_file "http://sourceforge.net/projects/pocketmine/files/builds/$MAC_BUILD.tar.gz" | tar -zx > /dev/null 2>&1
 			chmod +x ./bin/php5/bin/*
 			echo -n " checking..."
diff --git a/src/build/jenkins.sh b/src/build/jenkins.sh
index a3e2fbfc7..fc09ae46a 100644
--- a/src/build/jenkins.sh
+++ b/src/build/jenkins.sh
@@ -55,10 +55,10 @@ then
 	fi
 fi
 
-if [ "$COMPILE_MAC" = "true" ];
+if [ "$COMPILE_MAC_32" = "true" ];
 then
-    mkdir -p {$COMPILEDIR,$ARCHIVE}/mac
-    cd $COMPILEDIR/mac
+    mkdir -p {$COMPILEDIR,$ARCHIVE}/mac32
+    cd $COMPILEDIR/mac32
     
 	curl -L http://ftpmirror.gnu.org/libtool/libtool-2.4.2.tar.gz | tar -xz > /dev/null
 	cd libtool-2.4.2
@@ -72,16 +72,16 @@ then
     $SCRIPT mac curl
     
     tar -czf PHP_${PHP_VERSION}_x86_MacOS.tar.gz bin/
-    cp -r $COMPILEDIR/mac/{install.log,PHP_${PHP_VERSION}_x86_MacOS.tar.gz,install_data/*} $ARCHIVE/mac/
-	if [ ! -f $COMPILEDIR/mac/bin/php5/bin/php ]; then
+    cp -r $COMPILEDIR/mac32/{install.log,PHP_${PHP_VERSION}_x86_MacOS.tar.gz,install_data/*} $ARCHIVE/mac32/
+	if [ ! -f $COMPILEDIR/mac32/bin/php5/bin/php ]; then
 		exit 1
 	fi
 fi
 
 if [ "$COMPILE_MAC_64" = "true" ];
 then
-    mkdir -p {$COMPILEDIR,$ARCHIVE}/mac
-    cd $COMPILEDIR/mac
+    mkdir -p {$COMPILEDIR,$ARCHIVE}/mac64
+    cd $COMPILEDIR/mac64
     
 	curl -L http://ftpmirror.gnu.org/libtool/libtool-2.4.2.tar.gz | tar -xz > /dev/null
 	cd libtool-2.4.2
@@ -95,8 +95,8 @@ then
     $SCRIPT mac64 curl
     
     tar -czf PHP_${PHP_VERSION}_x86-64_MacOS.tar.gz bin/
-    cp -r $COMPILEDIR/mac/{install.log,PHP_${PHP_VERSION}_x86-64_MacOS.tar.gz,install_data/*} $ARCHIVE/mac/
-	if [ ! -f $COMPILEDIR/mac/bin/php5/bin/php ]; then
+    cp -r $COMPILEDIR/mac64/{install.log,PHP_${PHP_VERSION}_x86-64_MacOS.tar.gz,install_data/*} $ARCHIVE/mac/64
+	if [ ! -f $COMPILEDIR/mac64/bin/php5/bin/php ]; then
 		exit 1
 	fi
 fi