diff --git a/miniupnpd/Changelog.txt b/miniupnpd/Changelog.txt
index 163558b..7f873bc 100644
--- a/miniupnpd/Changelog.txt
+++ b/miniupnpd/Changelog.txt
@@ -1,6 +1,7 @@
 $Id: Changelog.txt,v 1.278 2012/04/30 21:21:32 nanard Exp $
 
 2012/04/30:
+  Clean up settings of CFLAGS in Makefile's
   Fix error handling in upnpevents.c (was causing segfault on Solaris !)
 
 2012/04/26:
diff --git a/miniupnpd/Makefile b/miniupnpd/Makefile
index 4e56c39..fd0b4da 100644
--- a/miniupnpd/Makefile
+++ b/miniupnpd/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.63 2012/04/20 13:50:24 nanard Exp $
+# $Id: Makefile,v 1.64 2012/04/30 13:58:31 nanard Exp $
 # MiniUPnP project
 # http://miniupnp.free.fr/ or http://miniupnp.tuxfamily.org/
 # Author: Thomas Bernard
@@ -15,8 +15,11 @@
 # $ CONFIG_OPTIONS="--ipv6 --igd2" make
 #
 
-CFLAGS = -pipe -Wall -Os -ansi
-#CFLAGS = -pipe -Wall -O -g -DDEBUG -ansi
+CFLAGS ?= -pipe -Os
+#CFLAGS = -pipe -O -g -DDEBUG
+CFLAGS += -ansi
+CFLAGS += -Wall
+CFLAGS += -W
 CC ?= gcc
 RM = rm -f
 MV = mv
diff --git a/miniupnpd/Makefile.linux b/miniupnpd/Makefile.linux
index 2393397..4d19b1b 100644
--- a/miniupnpd/Makefile.linux
+++ b/miniupnpd/Makefile.linux
@@ -1,4 +1,4 @@
-# $Id: Makefile.linux,v 1.65 2012/04/24 22:41:52 nanard Exp $
+# $Id: Makefile.linux,v 1.67 2012/04/30 21:06:28 nanard Exp $
 # MiniUPnP project
 # (c) 2006-2012 Thomas Bernard
 # http://miniupnp.free.fr/ or http://miniupnp.tuxfamily.org/
@@ -20,8 +20,14 @@
 # ./configure them and build them then miniupnpd will build using :
 # $ IPTABLESPATH=/path/to/iptables-1.4.1 make -f Makefile.linux
 #
-#CFLAGS = -Wall -O -D_GNU_SOURCE -g -DDEBUG -fno-strict-aliasing -Wstrict-prototypes -Wdeclaration-after-statement -ansi
-CFLAGS ?= -Wall -Os -D_GNU_SOURCE -fno-strict-aliasing -Wstrict-prototypes -Wdeclaration-after-statement -ansi
+#CFLAGS = -O -g -DDEBUG
+CFLAGS ?= -Os
+CFLAGS += -fno-strict-aliasing
+CFLAGS += -fno-common
+CFLAGS += -D_GNU_SOURCE
+CFLAGS += -Wall
+CFLAGS += -Wextra -Wstrict-prototypes -Wdeclaration-after-statement
+CFLAGS += -ansi
 CC ?= gcc
 RM = rm -f
 INSTALL = install