diff --git a/Documentation/TODO.sparc b/Documentation/TODO.sparc
index 9d4e70d..639bc3f 100644
--- a/Documentation/TODO.sparc
+++ b/Documentation/TODO.sparc
@@ -3,7 +3,6 @@ TODO-list:
 Sparc common:
 - Unimplemented features/bugs:
  - Send keycode on keypress
- - Add Make dependencies for .S files
  - Remove compiler warnings
  - Clean up
 
diff --git a/arch/sparc32/build.xml b/arch/sparc32/build.xml
index 45fcb98..847a17f 100644
--- a/arch/sparc32/build.xml
+++ b/arch/sparc32/build.xml
@@ -23,14 +23,12 @@
  </library>
 
  <executable name="target/arch/sparc32/entry.o" target="target">
-  <rule><![CDATA[
-	$(CC) $$EXTRACFLAGS $(CFLAGS) $(INCLUDES) -c -o $@ arch/sparc32/entry.S
-  ]]></rule>
+  <rule><![CDATA[ arch/sparc32/entry.S
+	$(CC) $$EXTRACFLAGS $(AS_FLAGS) $(CFLAGS) $(INCLUDES) -c -o $@ $^]]></rule>
  </executable>
  <executable name="target/arch/sparc32/vectors.o" target="target">
-  <rule><![CDATA[
-	$(CC) $$EXTRACFLAGS $(CFLAGS) $(INCLUDES) -c -o $@ arch/sparc32/vectors.S
-  ]]></rule>
+  <rule><![CDATA[ arch/sparc32/vectors.S
+	$(CC) $$EXTRACFLAGS $(AS_FLAGS) $(CFLAGS) $(INCLUDES) -c -o $@ $^]]></rule>
  </executable>
 
  <executable name="openbios-plain.elf" target="target" condition="IMAGE_ELF">
@@ -38,8 +36,7 @@
 	$(LD) -N -T arch/sparc32/ldscript -o $@.nostrip $^
 	$(NM) $@.nostrip | sort > $(ODIR)/openbios-plain.syms
 	cp $@.nostrip $@
-	$(STRIP) $@
-  </rule>
+	$(STRIP) $@</rule>
   <object source="plainboot.c"/>
   <external-object source="target/arch/sparc32/vectors.o"/>
   <external-object source="target/arch/sparc32/entry.o"/>
@@ -59,16 +56,13 @@
 	@echo "static const char forth_dictionary[] = {" > $@
 	@cat $< | hexdump -ve '1/0 "\t" 8/1 "0x%02x, " 1/0 "\n"' \
 					| sed 's/0x  ,//g' >> $@
-	@echo "};" >> $@
-  ]]></rule>
+	@echo "};" >> $@]]></rule>
   <external-object source="openbios-sparc32.dict"/>
  </executable>
 
  <executable name="target/arch/sparc32/builtin.o" target="target" condition="IMAGE_ELF_EMBEDDED">
-  <rule><![CDATA[
-	$(CC) $$EXTRACFLAGS $(CFLAGS) $(INCLUDES) -c -o $@ arch/sparc32/builtin.c
-  ]]></rule>
-  <external-object source="target/include/static-dict.h"/>
+  <rule><![CDATA[ arch/sparc32/builtin.c
+	$(CC) $$EXTRACFLAGS $(CFLAGS) $(INCLUDES) -c -o $@ $^]]></rule>
  </executable>
 
  <!-- END OF HACK ALERT -->
@@ -78,8 +72,7 @@
 	$(LD) -N -T arch/sparc32/ldscript -o $@.nostrip $^
 	$(NM) $@.nostrip | sort > $(ODIR)/openbios-builtin.syms
 	cp $@.nostrip $@
-	$(STRIP) $@
-  </rule>
+	$(STRIP) $@</rule>
   <external-object source="target/arch/sparc32/vectors.o"/>
   <external-object source="target/arch/sparc32/entry.o"/>
   <external-object source="target/arch/sparc32/builtin.o"/>
diff --git a/arch/sparc64/build.xml b/arch/sparc64/build.xml
index ff8fdf8..9066313 100644
--- a/arch/sparc64/build.xml
+++ b/arch/sparc64/build.xml
@@ -28,7 +28,6 @@
 	$(CC) $$EXTRACFLAGS $(AS_FLAGS) $(CFLAGS) $(INCLUDES) -c -o $@ $^]]></rule>
  </executable>
 
-
  <executable name="openbios-plain.elf" target="target" condition="IMAGE_ELF">
   <rule>
 	$(LD) -T arch/sparc64/ldscript -o $@.nostrip $^