diff --git a/configure.ac b/configure.ac
index 0aa076e..9134f0c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,13 +1,13 @@
 # $Id$
 
-AC_INIT(ttyvaders,0.0cvs-20021223)
+AC_INIT(ttyvaders,0.0cvs-20031110)
 
 AC_PREREQ(2.50)
 AC_CONFIG_SRCDIR(src/main.c)
 AC_CONFIG_AUX_DIR(autotools)
 AC_CANONICAL_SYSTEM
 
-AM_INIT_AUTOMAKE(ttyvaders,0.0cvs-20021223)
+AM_INIT_AUTOMAKE(ttyvaders,0.0cvs-20031110)
 AM_CONFIG_HEADER(config.h)
 
 AM_PROG_CC_C_O
@@ -36,6 +36,11 @@ fi
 AM_CONDITIONAL(USE_SLANG, ${USE_SLANG})
 AM_CONDITIONAL(USE_NCURSES, ${USE_NCURSES})
 
+# Optimizations
+CFLAGS="${CFLAGS} -g -O2 -fno-strength-reduce -fomit-frame-pointer"
+# Code qui fait des warnings == code de porc == deux baffes dans ta gueule
+CFLAGS="${CFLAGS} -Wall -Wpointer-arith -Wcast-align -Wcast-qual -Wstrict-prototypes -Wshadow -Waggregate-return -Wmissing-prototypes -Wnested-externs"
+
 AC_OUTPUT([
   Makefile
   libee/Makefile
diff --git a/libee/Makefile.am b/libee/Makefile.am
index c815dc1..459757f 100644
--- a/libee/Makefile.am
+++ b/libee/Makefile.am
@@ -2,11 +2,6 @@
 # Automake targets and declarations for libee
 ###############################################################################
 
-AM_CFLAGS = -g -O2 -fno-strength-reduce -fomit-frame-pointer
-
-# Code qui fait des warnings == code de porc == deux baffes dans ta gueule
-AM_CFLAGS += -Wall -Wpointer-arith -Wcast-align -Wcast-qual -Wstrict-prototypes -Wshadow -Waggregate-return -Wmissing-prototypes -Wnested-externs
-
 lib_LIBRARIES = libee.a
 libee_a_SOURCES = \
 	ee.c \
diff --git a/src/Makefile.am b/src/Makefile.am
index 725ad26..6ede6f3 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -2,11 +2,6 @@
 # Automake targets and declarations for ttyvaders
 ###############################################################################
 
-AM_CFLAGS = -g -O2 -fno-strength-reduce -fomit-frame-pointer
-
-# Code qui fait des warnings == code de porc == deux baffes dans ta gueule
-AM_CFLAGS += -Wall -Wpointer-arith -Wcast-align -Wcast-qual -Wstrict-prototypes -Wshadow -Waggregate-return -Wmissing-prototypes -Wnested-externs
-
 if USE_SLANG
 LDFLAGS_slang = -lslang
 endif
diff --git a/test/Makefile.am b/test/Makefile.am
index bd65ff8..1dfa5df 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -2,11 +2,6 @@
 # Automake targets and declarations for libee tests
 ###############################################################################
 
-AM_CFLAGS = -g -O2 -fno-strength-reduce -fomit-frame-pointer
-
-# Code qui fait des warnings == code de porc == deux baffes dans ta gueule
-AM_CFLAGS += -Wall -Wpointer-arith -Wcast-align -Wcast-qual -Wstrict-prototypes -Wshadow -Waggregate-return -Wmissing-prototypes -Wnested-externs
-
 if USE_SLANG
 LDFLAGS_slang = -lslang
 endif