diff --git a/Makefile b/Makefile
index cefb6988..6eb414ae 100644
--- a/Makefile
+++ b/Makefile
@@ -47,16 +47,7 @@ ifdef NOSLEEP
     DEFINES += -DMOVEMENT_LOW_ENERGY_MODE_FORBIDDEN
 endif
 
-ifdef EMSCRIPTEN
-all: $(BUILD)/$(BIN).elf $(BUILD)/$(BIN).html
-$(BUILD)/$(BIN).html: $(OBJS)
-	@echo HTML $@
-	@$(CC) $(LDFLAGS) $(OBJS) $(LIBS) -o $@ \
-		-s ASYNCIFY=1 \
-		-s EXPORTED_RUNTIME_METHODS=lengthBytesUTF8,printErr \
-		-s EXPORTED_FUNCTIONS=_main \
-		--shell-file=./watch-library/simulator/shell.html
-endif
+# Emscripten targets are now handled in rules.mk in gossamer
 
 # Add your include directories here.
 INCLUDES += \
diff --git a/gossamer b/gossamer
index eb8e7d64..dd9e89b9 160000
--- a/gossamer
+++ b/gossamer
@@ -1 +1 @@
-Subproject commit eb8e7d6445c2066ce420fae1cc2af11bec5da9ad
+Subproject commit dd9e89b9a096d58f9d4a8c0ad2b51884be66e3d7