diff --git a/.gitignore b/.gitignore
index 1d40508f3..d58955521 100644
--- a/.gitignore
+++ b/.gitignore
@@ -31,6 +31,7 @@ uboot
 uboot.S
 uboot.bin
 uboot.netx
+uboot.map
 System.map
 Module.symvers
 ARCH
diff --git a/Makefile b/Makefile
index b70f877e1..74bee5361 100644
--- a/Makefile
+++ b/Makefile
@@ -298,6 +298,8 @@ CFLAGS          := -Wall -Wundef -Wstrict-prototypes -Wno-trigraphs \
                    -fno-strict-aliasing -fno-common -Os -pipe
 AFLAGS          := -D__ASSEMBLY__
 
+LDFLAGS		:= -Map uboot.map
+
 # Read KERNELRELEASE from include/config/kernel.release (if it exists)
 KERNELRELEASE = $(shell cat include/config/kernel.release 2> /dev/null)
 KERNELVERSION = $(VERSION).$(PATCHLEVEL).$(SUBLEVEL)$(EXTRAVERSION)