diff --git a/configure.ac b/configure.ac
index db12131a0..0b6baeded 100644
--- a/configure.ac
+++ b/configure.ac
@@ -467,10 +467,15 @@ if test "x$enable_sanitizers" = "xyes"; then
 	CC_CHECK_FLAGS_APPEND([AM_CFLAGS],[CFLAGS],[ \
 		-fsanitize=address \
 		-fsanitize=undefined \
-		-fsanitize=memory \
+		-fno-optimize-sibling-calls \
 		-fno-omit-frame-pointer])
 	AC_SUBST(AM_CFLAGS)
 
+	CC_CHECK_FLAGS_APPEND([AM_LDFLAGS],[LDFLAGS],[ \
+		-fsanitize=address])
+
+	AC_SUBST(AM_LDFLAGS)
+
 	AC_MSG_RESULT([yes])
 else
 	AC_MSG_RESULT([no])