diff --git a/common.mak b/common.mak
index 62e2d7f6..1f767202 100644
--- a/common.mak
+++ b/common.mak
@@ -106,6 +106,11 @@ endif
 DEFAULT_CPPFLAGS = -D_GNU_SOURCE
 DEFAULT_LDFLAGS = -rdynamic
 
+ifeq ("${ASAN}","1")
+	DEFAULT_CFLAGS  += -fsanitize=address -fno-omit-frame-pointer
+	DEFAULT_LDFLAGS += -fsanitize=address
+endif
+
 #
 # Check for build dependency
 #
@@ -272,6 +277,7 @@ help:
 	@echo '  G=1      Build with gcov to collect code coverage data'
 	@echo '  V=1      Generate verbose build output'
 	@echo '  W=1      Build with higher warning level'
+	@echo '  ASAN=1   Build with address sanitizer'
 	@echo ''
 	@echo 'EXAMPLES'
 	@echo '  # make clean all D=1 W=1 -j'
diff --git a/zfcpdump/Makefile b/zfcpdump/Makefile
index cb2fd419..2c30f647 100644
--- a/zfcpdump/Makefile
+++ b/zfcpdump/Makefile
@@ -3,6 +3,9 @@ include ../common.mak
 CPIOINIT  = $(call echocmd,"  CPIOINI ",/$@)./cpioinit
 INSTALL_SCRIPTS = 10-zfcpdump.install
 
+ALL_CFLAGS += -fno-sanitize=all
+ALL_LDFLAGS += -fno-sanitize=all
+
 ifeq (${HAVE_LIBC_STATIC},0)
 
 all:
diff --git a/zipl/boot/Makefile b/zipl/boot/Makefile
index a2e5f190..09403a78 100644
--- a/zipl/boot/Makefile
+++ b/zipl/boot/Makefile
@@ -10,7 +10,8 @@ ALL_CFLAGS = $(NO_PIE_CFLAGS) -Os -g $(INCLUDE_PARMS) \
 	  -fno-delete-null-pointer-checks -fno-stack-protector \
 	  -fexec-charset=IBM1047 -m64 -mpacked-stack \
 	  -mstack-size=4096 -mstack-guard=128 -msoft-float \
-	  -W -Wall -Wformat-security
+	  -W -Wall -Wformat-security -fno-sanitize=all
+ALL_LDFLAGS += -fno-sanitize=all
 
 FILES	= fba0.bin fba1b.bin fba2.bin \
 	  eckd0_ldl.bin eckd0_cdl.bin \