diff --git a/m4/efl_binary.m4 b/m4/efl_binary.m4
index 3a811f8c11..d11e1db297 100644
--- a/m4/efl_binary.m4
+++ b/m4/efl_binary.m4
@@ -26,13 +26,13 @@ AC_ARG_WITH([bin-$2],
     efl_deprecated_option="yes"
    ], [])
 
-DOWN=${_efl_with_binary}
+DOWN[]$3=${_efl_with_binary}
 AC_MSG_NOTICE(DOWN[ set to ${_efl_with_binary}])
 
 with_binary_[]m4_defn([DOWN])[]$3=${_efl_with_binary}
 
 AM_CONDITIONAL(HAVE_[]UP[]m4_translit([[$3]], [a-z], [A-Z]), [test "x${_efl_binary_define}" = "xyes"])
-AC_SUBST(DOWN)
+AC_SUBST(DOWN[]$3)
 
 ])
 
diff --git a/po/Makevars.in b/po/Makevars.in
index a04b074fcd..00d6f9aa8d 100644
--- a/po/Makevars.in
+++ b/po/Makevars.in
@@ -12,8 +12,8 @@ XGETTEXT_FALLBACK := $(XGETTEXT)
 
 # Override xgettext with a LuaJIT aware variant (which calls
 # into plain xgettext if it needs to, and handles Lua on its own)
-XGETTEXT = ELUA=@elua_bin@ ELUA_INTREE=$(top_srcdir)/src/bin/elua/elua \
-	XGETTEXT=$(XGETTEXT_FALLBACK) ELUA_EXT=@EXEEXT@ \
+XGETTEXT = ELUA="@elua_bin@" ELUA_INTREE="$(top_srcdir)/src/bin/elua/elua" \
+	XGETTEXT="$(XGETTEXT_FALLBACK)" ELUA_EXT="@EXEEXT@" \
 	$(top_srcdir)/po/xgettext_wrapper.sh
 
 # These options get passed to xgettext.