diff --git a/ChangeLog b/ChangeLog
index e7c0152..21dc7fd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -9,6 +9,9 @@ Version 1.6.4
 	@name UPNP_E_UNSUBSCRIBE_UNACCAPTED [-302]
 	Also, the documentation file name was mispelled and was corrected in
 	the Makefile.am.
+2008-01-07 Marcelo Jimenez <mroberto(at)users.sourceforge.net>
+	* Putting back a "defined(__OSX__)" that has been removed in the
+	previous *BSD patch. Thanks to Chris Pickel for pointing it out.
 
 *******************************************************************************
 Version 1.6.3
diff --git a/THANKS b/THANKS
index 751807a..3dbcc08 100644
--- a/THANKS
+++ b/THANKS
@@ -10,6 +10,7 @@ exempt of errors.
 - Arno Willig
 - Bob Ciora
 - Chaos
+- Chris Pickel
 - Craig Nelson
 - David Maass
 - Emil Ljungdahl
diff --git a/threadutil/src/ThreadPool.c b/threadutil/src/ThreadPool.c
index 6734a58..ed48cec 100644
--- a/threadutil/src/ThreadPool.c
+++ b/threadutil/src/ThreadPool.c
@@ -389,7 +389,7 @@ static void SetSeed()
 	gettimeofday(&t, NULL);
 #if defined(WIN32)
  	srand( ( unsigned int )t.tv_usec + (unsigned int)ithread_get_current_thread_id().p );
-#elif defined(__FreeBSD__)
+#elif defined(__FreeBSD__) || defined(__OSX__)
  	srand( ( unsigned int )t.tv_usec + (unsigned int)ithread_get_current_thread_id() );
 #elif defined(__linux__)
  	srand( ( unsigned int )t.tv_usec + ithread_get_current_thread_id() );