diff --git a/README.md b/README.md
index 2b1e6c511..fa2b3fb84 100644
--- a/README.md
+++ b/README.md
@@ -20,7 +20,6 @@ Supported rendering backends:
 Platforms:
 
  * Android
- * JavaScript (via Emscripten)
  * Linux
  * Native Client
  * OSX
diff --git a/examples/common/entry_emscripten.cpp b/examples/common/entry_emscripten.cpp
deleted file mode 100644
index db96faf1f..000000000
--- a/examples/common/entry_emscripten.cpp
+++ /dev/null
@@ -1,73 +0,0 @@
-/*
- * Copyright 2011-2013 Branimir Karadzic. All rights reserved.
- * License: http://www.opensource.org/licenses/BSD-2-Clause
- */
-
-#include <bx/bx.h>
-
-#if BX_PLATFORM_EMSCRIPTEN
-
-#include <emscripten/emscripten.h>
-#include <alloca.h>
-#include <setjmp.h>
-
-#include "entry.h"
-
-namespace entry
-{
-	const Event* poll()
-	{
-		return NULL;
-	}
-
-	void release(const Event* _event)
-	{
-	}
-
-	void setWindowSize(uint32_t _width, uint32_t _height)
-	{
-	}
-
-	void toggleWindowFrame()
-	{
-	}
-
-	void setMouseLock(bool _lock)
-	{
-	}
-
-} // namespace entry
-
-extern int _main_(int _argc, char** _argv);
-
-static jmp_buf s_main;
-static jmp_buf s_loop;
-
-void emscripten_yield()
-{
-	if (!setjmp(s_main) )
-	{
-		longjmp(s_loop, 1);
-	}
-}
-
-void loop()
-{
-	if (!setjmp(s_loop) )
-	{
-		longjmp(s_main, 1);
-	}
-}
-
-int main(int _argc, char** _argv)
-{
-	if (!setjmp(s_loop) )
-	{
-		alloca(16<<10);
-		_main_(_argc, _argv);
-	}
-
-	emscripten_set_main_loop(loop, 10, true);
-}
-
-#endif // BX_PLATFORM_EMSCRIPTEN
diff --git a/makefile b/makefile
index e852410f5..0629419e0 100755
--- a/makefile
+++ b/makefile
@@ -7,7 +7,6 @@ all:
 	premake4 --file=premake/premake4.lua vs2008
 	premake4 --file=premake/premake4.lua vs2010
 	premake4 --file=premake/premake4.lua --gcc=android-arm gmake
-	premake4 --file=premake/premake4.lua --gcc=emscripten gmake
 	premake4 --file=premake/premake4.lua --gcc=nacl gmake
 	premake4 --file=premake/premake4.lua --gcc=nacl-arm gmake
 	premake4 --file=premake/premake4.lua --gcc=pnacl gmake
@@ -24,12 +23,6 @@ android-arm-release:
 	make -R -C .build/projects/gmake-android-arm config=release
 android-arm: android-arm-debug android-arm-release
 
-emscripten-debug:
-	make -R -C .build/projects/gmake-emscripten config=debug
-emscripten-arm-release:
-	make -R -C .build/projects/gmake-emscripten config=release
-emscripten-arm: emscripten-arm-debug emscripten-arm-release
-
 linux-debug32:
 	make -R -C .build/projects/gmake-linux config=debug32
 linux-release32: