diff --git a/makefile.defaults b/makefile.defaults
index 5a24295ce5..2646e4f1d8 100644
--- a/makefile.defaults
+++ b/makefile.defaults
@@ -187,6 +187,11 @@ COMPRESS = echo compress
 #COMPRESS = compress
 
 
+# How shell should execute built files
+# ====================================
+EXECUTE=
+
+
 # include toolchain-specific settings and overriders
 
 TOOLCHAIN=gcc
diff --git a/makefile.local b/makefile.local
index 273854f172..e7ac1433c5 100644
--- a/makefile.local
+++ b/makefile.local
@@ -66,7 +66,7 @@ gengmarr$(EXE_SUFFIX):	gengmarr$(OBJ_SUFFIX) position/position-host$(OBJ_SUFFIX)
 
 
 pygmarr.c: ./gengmarr$(EXE_SUFFIX)
-	./gengmarr$(EXE_SUFFIX) > $@
+	$(EXECUTE) ./gengmarr$(EXE_SUFFIX) > $@
 
 
 # ===========================================================
diff --git a/toolchains/emcc/make.incl b/toolchains/emcc/make.incl
new file mode 100644
index 0000000000..b7f9958042
--- /dev/null
+++ b/toolchains/emcc/make.incl
@@ -0,0 +1,22 @@
+# -*- Makefile -*-
+#
+
+# Include file for makefile.unx for compiling on Linux using emcc
+
+# Requirements:
+#
+# Emscripten SDK and Java
+#
+
+
+include toolchains/gcc/make.incl
+CCHOST=emcc
+LDHOST=emcc
+CCTARGET=emcc
+LDTARGET=emcc
+EXE_SUFFIX=.js
+STRIPTARGET=@echo "already stripped"
+CCOPTIM=
+LDOPTIM=
+EXECUTE=nodejs
+OSTYPE=asm.js
diff --git a/toolchains/emcc/makefile.local b/toolchains/emcc/makefile.local
new file mode 100644
index 0000000000..cf1bfba70f
--- /dev/null
+++ b/toolchains/emcc/makefile.local
@@ -0,0 +1,6 @@
+# -*- Makefile -*-
+#
+
+include makefile.rules
+
+DISTRIBUTEDFILES = 	makefile.local make.incl