diff --git a/SConscript b/SConscript
index c536619fd7..7b34bba8a0 100644
--- a/SConscript
+++ b/SConscript
@@ -416,6 +416,8 @@ elif platform == "Linux":
 elif platform == "Darwin":
 	env.Append(CPPDEFINES=['MACOSX'])
 	#env.Append(LINKFLAGS=['-headerpad_max_install_names']) #needed in some cross compiles
+	if GetOption('luajit'):
+		env.Append(LINKFLAGS=['-pagezero_size=10000, '-image_base=100000000']
 
 
 #Add architecture flags and defines
diff --git a/src/Config.h b/src/Config.h
index 35e71af383..eef2d5765b 100644
--- a/src/Config.h
+++ b/src/Config.h
@@ -16,11 +16,11 @@
 #endif
 
 #ifndef MINOR_VERSION
-#define MINOR_VERSION 2
+#define MINOR_VERSION 5
 #endif
 
 #ifndef BUILD_NUM
-#define BUILD_NUM 333
+#define BUILD_NUM 336
 #endif
 
 #ifndef SNAPSHOT_ID