diff --git a/bacnet-stack/Makefile b/bacnet-stack/Makefile
index 4e268c30..fd57bb2b 100644
--- a/bacnet-stack/Makefile
+++ b/bacnet-stack/Makefile
@@ -100,7 +100,7 @@ ports:	atmega168 at91sam7s bdk-atxx4-mstp
 atmega168: ports/atmega168/Makefile
 	make -C ports/atmega168 clean all
 
-at91sam7s: ports/at91sam7s/Makefile
+at91sam7s: ports/at91sam7s/makefile
 	make -C ports/at91sam7s clean all
 
 bdk-atxx4-mstp: ports/bdk-atxx4-mstp/Makefile
diff --git a/bacnet-stack/ports/at91sam7s/makefile b/bacnet-stack/ports/at91sam7s/makefile
index 92252317..77ef2102 100644
--- a/bacnet-stack/ports/at91sam7s/makefile
+++ b/bacnet-stack/ports/at91sam7s/makefile
@@ -126,9 +126,12 @@ $(LIBRARY): $(COREOBJ) Makefile
 .s.o:
 	$(CC) -c $(AFLAGS) $*.s -o $@
 
+.PHONY: clean
 clean:
-	touch Makefile
 	rm $(COBJ) $(AOBJ) $(COREOBJ)
 	rm $(TARGET).elf $(TARGET).bin $(TARGET).dmp $(TARGET).map
 	rm $(LIBRARY)
 	rm *.lst
+
+## Other dependencies
+-include $(shell mkdir dep 2>/dev/null) $(wildcard dep/*)