diff --git a/acinclude.m4 b/acinclude.m4
index f15dfd1a..955e8645 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -12,7 +12,8 @@ AC_DEFUN([AC_PROG_CC_PIE], [
 
 AC_DEFUN([COMPILER_FLAGS], [
 	if (test "${CFLAGS}" = ""); then
-		CFLAGS="-Wall -O2 -D_FORTIFY_SOURCE=2 -fsigned-char"
+		CFLAGS="-Wall -O2 -fsigned-char "
+		CFLAGS+=" -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=2"
 	fi
 	if (test "$USE_MAINTAINER_MODE" = "yes"); then
 		CFLAGS+=" -Werror -Wextra"