diff --git a/Makefile.griffin b/Makefile.griffin
index 0840c0891b..bf963f347b 100644
--- a/Makefile.griffin
+++ b/Makefile.griffin
@@ -209,12 +209,14 @@ else ifeq ($(platform), vita)
   EXT_TARGET := $(TARGET_NAME)_$(platform).velf
   EXT_INTER_TARGET := $(TARGET_NAME)_$(platform).elf
   MACHDEP := -DVITA
+  WANT_ZLIB						:= 1
   INCLUDE += -I$(VITASDK)/arm-vita-eabi/include/freetype2 -Ideps/libvita2d/include
+  INCLUDE += -Ideps/zlib
   PLATCFLAGS :=  -O3 -mfloat-abi=hard -ffast-math -fsingle-precision-constant
   LIBS += -lSceKernel_stub -lSceDisplay_stub -lSceGxm_stub -lSceNet_stub -lSceNetCtl_stub\
 			 -lSceSysmodule_stub -lSceCtrl_stub -lSceAudio_stub \
 			 -lScePower_stub -lSceRtc_stub -lSceCommonDialog_stub -lScePgf_stub \
-			 -lfreetype -lz -lm -lc -lpng -ljpeg
+			 -lfreetype -lm -lc -lpng -ljpeg
 
   PLATEXTRA := deps/libvita2d/shader/compiled/clear_v_gxp.o \
 				  deps/libvita2d/shader/compiled/clear_f_gxp.o \
diff --git a/frontend/drivers/platform_emscripten.c b/frontend/drivers/platform_emscripten.c
index 0152700fbf..909b621140 100644
--- a/frontend/drivers/platform_emscripten.c
+++ b/frontend/drivers/platform_emscripten.c
@@ -75,3 +75,28 @@ int main(int argc, char *argv[])
 
    return 0;
 }
+
+frontend_ctx_driver_t frontend_ctx_emscripten = {
+   NULL,                         /* environment_get */
+   NULL,                         /* init */
+   NULL,                         /* deinit */
+   NULL,                         /* exitspawn */
+   NULL,                         /* process_args */
+   NULL,                         /* exec */
+   NULL,                         /* set_fork */
+   NULL,                         /* shutdown */
+   NULL,                         /* get_name */
+   NULL,                         /* get_os */
+   NULL,                         /* get_rating */
+   NULL,                         /* load_content */
+   NULL,                         /* get_architecture */
+   NULL,                         /* get_powerstate */
+   NULL,                         /* parse_drive_list */
+   NULL,                         /* get_mem_total */
+   NULL,                         /* get_mem_used */
+   NULL,                         /* install_sighandlers */
+   NULL,                         /* get_signal_handler_state */
+   NULL,                         /* set_signal_handler_state */
+   NULL,                         /* destroy_signal_handler_state */
+   "emscripten"
+};
diff --git a/frontend/frontend_driver.c b/frontend/frontend_driver.c
index fe4a756699..710ba0d0d8 100644
--- a/frontend/frontend_driver.c
+++ b/frontend/frontend_driver.c
@@ -25,7 +25,9 @@
 #endif
 
 static frontend_ctx_driver_t *frontend_ctx_drivers[] = {
-#if defined(__CELLOS_LV2__)
+#if defined(EMSCRIPTEN)
+   &frontend_ctx_emscripten,
+#elif defined(__CELLOS_LV2__)
    &frontend_ctx_ps3,
 #endif
 #if defined(_XBOX)
diff --git a/frontend/frontend_driver.h b/frontend/frontend_driver.h
index be3a80b4fb..66f4bc348a 100644
--- a/frontend/frontend_driver.h
+++ b/frontend/frontend_driver.h
@@ -103,6 +103,7 @@ extern frontend_ctx_driver_t frontend_ctx_psp;
 extern frontend_ctx_driver_t frontend_ctx_ctr;
 extern frontend_ctx_driver_t frontend_ctx_win32;
 extern frontend_ctx_driver_t frontend_ctx_xenon;
+extern frontend_ctx_driver_t frontend_ctx_emscripten;
 extern frontend_ctx_driver_t frontend_ctx_null;
 
 /**