diff --git a/firmware/.gitignore b/firmware/.gitignore
index 586d0f2..5eb99b9 100644
--- a/firmware/.gitignore
+++ b/firmware/.gitignore
@@ -1,5 +1,6 @@
 *.bin
 *.elf
+*.map
 lpc1xxx/memory.ld
 applications/wrapper.c
 lcd/allfonts.h
diff --git a/firmware/Makefile b/firmware/Makefile
index 5cf7513..7555ad5 100644
--- a/firmware/Makefile
+++ b/firmware/Makefile
@@ -74,7 +74,7 @@ l0dables: table.c
 	@cd l0dable && $(MAKE)
 
 clean:
-	rm -f $(OBJS) $(LD_TEMP) $(OUTFILE).elf $(OUTFILE).bin $(OUTFILE).hex table.c table.h
+	rm -f $(OBJS) $(LD_TEMP) $(OUTFILE).elf $(OUTFILE).bin $(OUTFILE).hex $(OUTFILE).map table.c table.h
 	for dir in $(SUBDIRS); do \
 	    $(MAKE) $(CONFIG_MAKE_PRINTDIRECTORY) -C $$dir clean; \
 	done
@@ -111,7 +111,7 @@ $(LD_TEMP):
 	-@echo "INCLUDE $(LD_SCRIPT)" >> $(LD_TEMP)
 
 $(OUTFILE).elf: $(OBJS) $(SYS_OBJS) $(SUBDIRS) $(LPCFIX) $(LD_TEMP)
-	$(LD) $(LDFLAGS) -T $(LD_TEMP) -o $(OUTFILE).elf $(OBJS) $(LDLIBS)
+	$(LD) $(LDFLAGS) -Map=$(OUTFILE).map -T $(LD_TEMP) -o $(OUTFILE).elf $(OBJS) $(LDLIBS)
 	-@echo ""
 	$(SIZE) $(OUTFILE).elf
 	-@echo ""