diff --git a/Makefile.am b/Makefile.am
index c2dae4d..f17c314 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -13,13 +13,8 @@ src_bip_SOURCES = src/conf.y src/lex.l \
 src_bipmkpw_SOURCES = src/bipmkpw.c src/md5.c src/util.c
 AM_YFLAGS= -d
 BUILT_SOURCES = src/conf.c src/conf.h src/lex.c
-if DEBUG
-	AM_CFLAGS+=-Wall -g
-	AM_LDFLAGS+=-g
-else
-	AM_CFLAGS+=-Wall
-endif
 
+AM_CFLAGS=-Wall -Wextra
 
 dist_man_MANS = bip.1 bip.conf.5 bipmkpw.1
 
diff --git a/configure.ac b/configure.ac
index 005e697..5740a39 100644
--- a/configure.ac
+++ b/configure.ac
@@ -44,16 +44,12 @@ AC_ARG_ENABLE([pie], AS_HELP_STRING([--disable-pie], [Do not build a position in
 
 AM_CONDITIONAL(DEBUG, test x$enable_debug = xyes)
 AS_IF([test "x$enable_debug" = "xyes"], [
-	CFLAGS="-O0 -g -W -Wall"
-	LDFLAGS="-g"
 	AC_CHECK_FUNC(backtrace_symbols_fd, [
 		AC_DEFINE(HAVE_BACKTRACE, [], [Use glibc backtrace on fatal()])
 		LDFLAGS="-rdynamic $LDFLAGS"
 		backtrace="(with backtrace)"
 	])
 ], [
-	CFLAGS="-O2 -g -W -Wall"
-	LDFLAGS="-g"
 	enable_debug=no
 ])