diff --git a/build_test.mk b/build_test.mk
index 9f5d6e0af..ee15a4572 100644
--- a/build_test.mk
+++ b/build_test.mk
@@ -31,6 +31,7 @@ $(GTEST_OUTPUT)_DEFS :=
 $(GTEST_OUTPUT)_INC := $(GTEST_INC) $(GTEST_INTERNAL_INC)
 
 LDFLAGS += -lstdc++ -lpthread -shared-libgcc
+CREATE_MAP := no
 
 VPATH +=\
 	$(LIB_PATH)/googletest\
diff --git a/tmk_core/rules.mk b/tmk_core/rules.mk
index 317f55e08..695fe0bad 100644
--- a/tmk_core/rules.mk
+++ b/tmk_core/rules.mk
@@ -161,6 +161,7 @@ SCANF_LIB =
 
 
 MATH_LIB = -lm
+CREATE_MAP ?= yes
 
 
 #---------------- Linker Options ----------------
@@ -171,7 +172,10 @@ MATH_LIB = -lm
 # Comennt out "--relax" option to avoid a error such:
 # 	(.vectors+0x30): relocation truncated to fit: R_AVR_13_PCREL against symbol `__vector_12'
 #
-LDFLAGS += -Wl,-Map=$(BUILD_DIR)/$(TARGET).map,--cref
+
+ifeq ($(CREATE_MAP),yes)
+	LDFLAGS += -Wl,-Map=$(BUILD_DIR)/$(TARGET).map,--cref
+endif
 #LDFLAGS += -Wl,--relax
 LDFLAGS += $(EXTMEMOPTS)
 LDFLAGS += $(patsubst %,-L%,$(EXTRALIBDIRS))