diff --git a/Makefile.emscripten b/Makefile.emscripten
index d8f60bb4b6..2cdff23034 100644
--- a/Makefile.emscripten
+++ b/Makefile.emscripten
@@ -3,6 +3,7 @@ TARGET = retroarch.js
 OBJ = frontend/platform/platform_emscripten.o \
 		frontend/platform/platform_null.o \
 		frontend/frontend.o \
+		frontend/frontend_context.o \
 		frontend/menu/menu_input_line_cb.o \
 		retroarch.o \
 		file.o \
diff --git a/frontend/frontend.c b/frontend/frontend.c
index 6d1ff61ba2..00fd3ffddc 100644
--- a/frontend/frontend.c
+++ b/frontend/frontend.c
@@ -46,10 +46,8 @@
 #define args_initial_ptr() data
 #else
 
-#if defined(__APPLE__) || defined(HAVE_BB10)
+#if defined(__APPLE__) || defined(HAVE_BB10) || defined(EMSCRIPTEN)
 #define main_entry rarch_main
-#elif defined(EMSCRIPTEN)
-#define main_entry _fakemain
 #else
 #define main_entry main
 #endif