diff --git a/make_emscripten.sh b/make_emscripten.sh
index bfead57f5..6f2086208 100755
--- a/make_emscripten.sh
+++ b/make_emscripten.sh
@@ -9,30 +9,42 @@ cmake .
 emcc -D "PB_FIELD_16BIT=1" \
     -Isrc/ \
     -Isrc/cdogs/ \
-    -Isrc/cdogs/proto/nanopb/ \
+    -Isrc/proto/nanopb/ \
     -Isrc/cdogs/enet/include/ \
     -Isrc/cdogs/include/ \
     -Isrc/tests/ \
     src/*.c \
     $(find src/cdogs/ -name "*.c") \
     src/json/*.c \
-    -g4 \
-    -O0 \
-    -s ASSERTIONS=1 \
-    -s ALLOW_MEMORY_GROWTH=1 \
+    src/proto/*.c \
+    src/proto/nanopb/*.c \
+    -c \
+    -O3 \
     -s USE_SDL=2 \
     -s USE_SDL_IMAGE=2 \
     -s USE_SDL_MIXER=2 \
     -s SDL2_IMAGE_FORMATS='["png"]' \
     -s USE_VORBIS=1 \
-    -s USE_OGG=1 \
-    --preload-file data \
-    --preload-file doc \
-    --preload-file dogfights \
-    --preload-file graphics \
-    --preload-file missions \
-    --preload-file music \
-    --preload-file sounds \
-    -o emscripten/index.html
+    -s USE_OGG=1
+
+emcc -O3 \
+     *.o \
+     -o emscripten/index.html \
+     -s USE_SDL=2 \
+     -s USE_SDL_IMAGE=2 \
+     -s SDL2_IMAGE_FORMATS='["png"]' \
+     -s USE_SDL_MIXER=2 \
+     -s SDL2_MIXER_FORMATS='["ogg"]' \
+     -lidbfs.js \
+     -sASYNCIFY \
+     -sSTACK_SIZE=131072 \
+     -sINITIAL_MEMORY=128mb \
+     --preload-file data \
+     --preload-file doc \
+     --preload-file dogfights \
+     --preload-file graphics \
+     --preload-file missions \
+     --preload-file music \
+     --preload-file sounds
 
 cp build/windows/cdogs-icon.ico emscripten/favicon.ico