diff --git a/configure.ac b/configure.ac
index 5443e008db..da1c7a9b08 100644
--- a/configure.ac
+++ b/configure.ac
@@ -221,6 +221,8 @@ AM_CONDITIONAL([HAVE_WIN32], [test "x${have_win32}" = "xyes"])
 AM_CONDITIONAL([HAVE_WINDOWS], [test "x${have_windows}" = "xyes"])
 AM_CONDITIONAL([HAVE_PS3], [test "x${have_ps3}" = "xyes"])
 
+AM_CONDITIONAL([HAVE_OSX], [test "x${have_darwin}" = "xyes"])
+AM_CONDITIONAL([HAVE_X86_64], [test "x${host_cpu}" = "xx86_64"])
 
 #### Checks for programs
 
@@ -3994,6 +3996,7 @@ if test "${want_lua_old}" = "yes"; then
 else
    EFL_DEPEND_PKG([EDJE], [LUAJIT], [luajit >= 2.0.0])
    EFL_DEPEND_PKG([EVAS], [LUAJIT], [luajit >= 2.0.0])
+   EFL_DEPEND_PKG([EVAS_CXX], [LUAJIT], [luajit >= 2.0.0])
 fi
 
 EFL_ADD_LIBS([EDJE], [-lm])
diff --git a/src/Makefile_Elua.am b/src/Makefile_Elua.am
index 2b292d266c..1c170e4dd9 100644
--- a/src/Makefile_Elua.am
+++ b/src/Makefile_Elua.am
@@ -13,6 +13,13 @@ bin_elua_elua_CPPFLAGS = -I$(top_builddir)/src/lib/efl @ELUA_CFLAGS@ \
 	-DPACKAGE_BUILD_DIR=\"$(abs_top_builddir)\" \
 	-DPACKAGE_BIN_DIR=\"$(bindir)\" \
 	-DPACKAGE_DATA_DIR=\"$(datadir)/elua\"
+
+if HAVE_OSX
+if  HAVE_X86_64
+bin_elua_elua_LDFLAGS = -pagezero_size 10000 -image_base 100000000
+endif
+endif
+
 if HAVE_WIN32
 bin_elua_elua_LDADD = -L$(top_builddir)/src/lib/evil @ELUA_LIBS@
 else