diff --git a/ChangeLog b/ChangeLog
index 63ec79c..9e54d01 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,11 @@
 Version 1.6.3
 *******************************************************************************
 
+2007-12-25 Marcelo Jimenez <mroberto(at)users.sourceforge.net>
+	* Using pthread flags for the whole project, not just at the places
+	individually indicated by several Makefile.am files spread all over
+	the directories. That was too much error prone.
+
 2007-12-24 Marcelo Jimenez <mroberto(at)users.sourceforge.net>
 	* Added a configure test to check if pthread_rwlock_t is available.
 	Define _GNU_SOURCE if needed. The fallback behaviou will only be
diff --git a/configure.ac b/configure.ac
index c6ea558..1161dee 100644
--- a/configure.ac
+++ b/configure.ac
@@ -335,6 +335,12 @@ ACX_PTHREAD(
 	[],
 	[AC_MSG_ERROR([POSIX threads are required to build this program])])
 #
+# Update environment variables for pthreads
+#
+CC="$PTHREAD_CC"
+CFLAGS="$PTHREAD_CFLAGS $CFLAGS"
+LIBS="$PTHREAD_LIBS $LIBS"
+#
 # Determine if pthread_rwlock_t is available
 #
 echo "----------------------- pthread_rwlock_t stuff --------------------------------"
diff --git a/threadutil/Makefile.am b/threadutil/Makefile.am
index 1da00f1..bcda080 100644
--- a/threadutil/Makefile.am
+++ b/threadutil/Makefile.am
@@ -6,7 +6,6 @@
 #
 
 AM_CPPFLAGS		= -I$(srcdir)/inc -I$(srcdir)/src/inc
-AM_CFLAGS		= $(PTHREAD_CFLAGS)
 
 if ENABLE_DEBUG
     AM_CPPFLAGS		+= -DDEBUG -DSTATS
diff --git a/upnp/Makefile.am b/upnp/Makefile.am
index 85bacad..ec3399e 100644
--- a/upnp/Makefile.am
+++ b/upnp/Makefile.am
@@ -11,10 +11,6 @@ AM_CPPFLAGS = \
 	-I$(top_srcdir)/threadutil/inc \
 	-I$(top_srcdir)/ixml/inc
 
-AM_CFLAGS = $(PTHREAD_CFLAGS)
-
-AM_LDFLAGS = $(PTHREAD_LIBS)
-
 LDADD = \
 	libupnp.la \
 	$(top_builddir)/threadutil/libthreadutil.la \
diff --git a/upnp/sample/Makefile.am b/upnp/sample/Makefile.am
index 590a5e3..2a7b0b8 100644
--- a/upnp/sample/Makefile.am
+++ b/upnp/sample/Makefile.am
@@ -9,10 +9,6 @@ AM_CPPFLAGS = \
 	-I$(top_srcdir)/threadutil/inc \
 	-I$(top_srcdir)/ixml/inc
 
-AM_CFLAGS = $(PTHREAD_CFLAGS)
-
-AM_LDFLAGS = $(PTHREAD_LIBS)
-
 LDADD = \
 	$(top_builddir)/upnp/libupnp.la \
 	$(top_builddir)/threadutil/libthreadutil.la \