diff --git a/Gui/Makefile b/Gui/Makefile
index f9fa4b5483..df2f652ae5 100644
--- a/Gui/Makefile
+++ b/Gui/Makefile
@@ -7,7 +7,7 @@ include config.mak
 INCDIR  = -I. -I../loader -I./wm -I./skin $(FREETYPE_INC) $(GTKINC) $(EXTRA_INC) 
 
 OPTIMIZE =  $(OPTFLAGS) -fomit-frame-pointer \
-            -fexpensive-optimizations -fschedule-insns2 -Wall
+            -fexpensive-optimizations -fschedule-insns2
 ifeq ($(TARGET_ARCH_X86),yes)
 OPTIMIZE += -malign-double
 endif
diff --git a/configure b/configure
index bfbdd97d40..a9a9843584 100755
--- a/configure
+++ b/configure
@@ -2164,6 +2164,19 @@ else
 fi
 echores "$_sys_sysinfo"
 
+echocheck "-Wall option"
+cat > $TMPC << EOF
+int main(void) { return 0; }
+EOF
+_wall=no
+cc_check -Wall && _wall=yes
+if test "$_wall" = yes ; then
+  _ld_wall='-Wall'
+else
+  _ld_wall=''
+fi
+echores "$_wall"
+
 
 #########
 # VIDEO #
@@ -4390,9 +4403,9 @@ if test "$_profile" != "" || test "$_debug" != "" ; then
   _stripbinaries=no
 elif test -z "$CFLAGS" ; then
   if test "$host_arch" != "mips" ; then
-    CFLAGS="-O4 $_march $_mcpu -pipe -ffast-math -fomit-frame-pointer"
+    CFLAGS="-O4 $_march $_mcpu -pipe -ffast-math -fomit-frame-pointer $_ld_wall"
   else
-    CFLAGS="-O4 $_march $_mcpu -ffast-math -fomit-frame-pointer"
+    CFLAGS="-O4 $_march $_mcpu -ffast-math -fomit-frame-pointer $_ld_wall"
   fi
   # always compile with '-g' if .developer:
   if test -f ".developer" ; then
diff --git a/libaf/Makefile b/libaf/Makefile
index 05aac6d3cb..9ee180afca 100644
--- a/libaf/Makefile
+++ b/libaf/Makefile
@@ -6,7 +6,7 @@ SRCS=af.c af_mp.c af_dummy.c af_delay.c af_channels.c af_format.c af_resample.c
 
 OBJS=$(SRCS:.c=.o)
 
-CFLAGS  = $(OPTFLAGS) -I. -Wall 
+CFLAGS  = $(OPTFLAGS) -I.
 .SUFFIXES: .c .o
 
 .c.o: