diff --git a/miniupnpc/Changelog.txt b/miniupnpc/Changelog.txt
index 3e982e1..d3b9738 100644
--- a/miniupnpc/Changelog.txt
+++ b/miniupnpc/Changelog.txt
@@ -1,6 +1,9 @@
-$Id: Changelog.txt,v 1.167 2012/04/20 14:13:10 nanard Exp $
+$Id: Changelog.txt,v 1.168 2012/05/01 16:16:51 nanard Exp $
 miniUPnP client Changelog.
 
+2012/05/01:
+  Cleanup settings of CFLAGS in Makefile
+
 2012/04/20:
   Allow to specify protocol with TCP or UDP for -A option
 
diff --git a/miniupnpc/Makefile b/miniupnpc/Makefile
index 525bbc8..5ed3b33 100644
--- a/miniupnpc/Makefile
+++ b/miniupnpc/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.93 2012/04/09 12:49:26 nanard Exp $
+# $Id: Makefile,v 1.95 2012/05/01 16:16:50 nanard Exp $
 # MiniUPnP Project
 # http://miniupnp.free.fr/
 # (c) 2005-2011 Thomas Bernard
@@ -20,8 +20,14 @@ endif
 
 CC ?= gcc
 #AR = gar
-#CFLAGS = -O -Wall -g -DDEBUG -ansi -Wstrict-prototypes
-CFLAGS ?= -O -Wall -DNDEBUG -DMINIUPNPC_SET_SOCKET_TIMEOUT -ansi -Wstrict-prototypes -D_BSD_SOURCE
+#CFLAGS = -O -g -DDEBUG
+CFLAGS ?= -O
+CFLAGS += -Wall
+CFLAGS += -W -Wstrict-prototypes
+CFLAGS += -fno-common
+CFLAGS += -DMINIUPNPC_SET_SOCKET_TIMEOUT
+CFLAGS += -D_BSD_SOURCE -D_POSIX_C_SOURCE=1
+CFLAGS += -ansi
 # -DNO_GETADDRINFO
 INSTALL = install
 SH = /bin/sh