diff --git a/minissdpd/Changelog.txt b/minissdpd/Changelog.txt
index 2f8cbac..4dca8ae 100644
--- a/minissdpd/Changelog.txt
+++ b/minissdpd/Changelog.txt
@@ -1,4 +1,7 @@
-$Id: Changelog.txt,v 1.24 2012/04/09 21:07:26 nanard Exp $
+$Id: Changelog.txt,v 1.25 2012/05/02 10:30:40 nanard Exp $
+
+2012/05/02:
+	Clean CLFAGS in Makefile.
 
 2012/04/09:
 	Added -ansi to compilation flags.
diff --git a/minissdpd/Makefile b/minissdpd/Makefile
index 7f83e76..e924acb 100644
--- a/minissdpd/Makefile
+++ b/minissdpd/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.16 2012/04/09 12:57:47 nanard Exp $
+# $Id: Makefile,v 1.17 2012/05/02 10:26:50 nanard Exp $
 # MiniUPnP project
 # author: Thomas Bernard
 # website: http://miniupnp.free.fr/ or http://miniupnp.tuxfamily.org/
@@ -11,8 +11,13 @@
 # make install (miniupnpd will be put in /usr/sbin)
 #
 # install target is made for linux... sorry BSD users...
-#CFLAGS = -Wall -g -D_GNU_SOURCE -Wstrict-prototypes -ansi
-CFLAGS = -Wall -Os -D_GNU_SOURCE -fno-strict-aliasing -Wstrict-prototypes -ansi
+#CFLAGS = -g
+CFLAGS ?= -Os
+CFLAGS += -Wall
+CFLAGS += -W -Wstrict-prototypes
+CFLAGS += -fno-strict-aliasing -fno-common
+CFLAGS += -D_GNU_SOURCE
+CFLAGS += -ansi
 CC = gcc
 RM = rm -f
 INSTALL = install