diff --git a/Makefile b/Makefile
index ea0bd72..173dc3b 100644
--- a/Makefile
+++ b/Makefile
@@ -7,6 +7,9 @@ android-arm: base android-arm/Dockerfile
 darwin-x64:
 	$(DOCKER) build -t $(IMAGE)-darwin-x64 darwin-x64
 
+javascript-asmjs: base javascript-asmjs/Dockerfile
+	$(DOCKER) build -t $(IMAGE)-javascript-asmjs javascript-asmjs
+
 linux-x86:
 	$(DOCKER) build -t $(IMAGE)-darwin-x86 darwin-x86
 
diff --git a/javascript-asmjs/Dockerfile b/javascript-asmjs/Dockerfile
new file mode 100644
index 0000000..d64a112
--- /dev/null
+++ b/javascript-asmjs/Dockerfile
@@ -0,0 +1,24 @@
+FROM thewtex/cross-compiler-base
+MAINTAINER Matt McCormick "matt.mccormick@kitware.com"
+
+# The cross-compiling emulator
+RUN curl -sL https://deb.nodesource.com/setup | bash - && \
+  apt-get install -y \
+    default-jre \
+    nodejs \
+    python2.7
+
+# Todo: use master after the CMake patches have been merged
+RUN cd /usr && \
+  curl -L https://s3.amazonaws.com/mozilla-games/emscripten/releases/emsdk-portable.tar.gz | tar xz && \
+  cd ./emsdk_portable && \
+  ./emsdk update && \
+  ./emsdk install -j$(nproc) --build=Release sdk-incoming-64bit && \
+  ./emsdk activate --build=Release sdk-incoming-64bit && \
+  find . -name "*.o" -exec rm {} \; && \
+  find . -name "*.a" -exec rm {} \; && \
+  find . -name "*.tmp" -exec rm {} \;
+
+ENV PATH /usr/emsdk_portable:/usr/emsdk_portable/clang/fastcomp/build_incoming_64/bin:/usr/emsdk_portable/emscripten/incoming:${PATH}
+
+ENV CMAKE_TOOLCHAIN_FILE /usr/emsdk_portable/emscripten/incoming/cmake/Modules/Platform/Emscripten.cmake