diff --git a/Makefile b/Makefile
index 4520c20f74..6660e79cc6 100644
--- a/Makefile
+++ b/Makefile
@@ -88,7 +88,7 @@ print-% : ; $(info $* is a $(flavor $*) variable set to [$($*)]) @true
 $(BUILD_DIR):
 	mkdir -p $(BUILD_DIR)
 
-$(BUILD_DIR)/%.o: %.s
+$(BUILD_DIR)/%.s.o: %.s
 	$(AS) $(ASFLAGS) -o $@ $<
 
 $(BUILD_DIR)/%.c.o: %.c $(H_FILES)
diff --git a/tools/n64splat b/tools/n64splat
index b349796f4e..91d14b76cd 160000
--- a/tools/n64splat
+++ b/tools/n64splat
@@ -1 +1 @@
-Subproject commit b349796f4ef5d7f796ac0796c7a9974f5b735547
+Subproject commit 91d14b76cd4bb956b586d5802c1a86e019ca8029
diff --git a/tools/splat.yaml b/tools/splat.yaml
index 9bf1d51de8..aa9b4e5b56 100644
--- a/tools/splat.yaml
+++ b/tools/splat.yaml
@@ -5,6 +5,7 @@ options:
   pycparser_flags: ["-Iinclude", "-D_LANGUAGE_C", "-ffreestanding", "-DF3DEX_GBI_2", "-DSPLAT"]
   compiler: "GCC"
   mnemonic_ljust: 10
+  o_as_suffix: yes
 segments:
   - name: header
     type: header