diff --git a/ChangeLog b/ChangeLog
index c18d9c1..889e607 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,9 @@
 Version 1.6.6
 *******************************************************************************
 
+2008-04-10 Marcelo Jimenez <mroberto(at)users.sourceforge.net>
+	* Apostolos Syropoulos changes for OpenSolaris x86.
+
 2008-03-20 Marcelo Jimenez <mroberto(at)users.sourceforge.net>
 	* Andre Sodermans (wienerschnitzel) patch for building libupnp under
 	windows systems with VC9.
diff --git a/THANKS b/THANKS
index ebe0d89..0e8eb0c 100644
--- a/THANKS
+++ b/THANKS
@@ -8,6 +8,7 @@ exempt of errors.
 
 - Alex (afaucher)
 - Andre Sodermans (wienerschnitzel)
+- Apostolos Syropoulos
 - Arno Willig
 - Bob Ciora
 - Chaos
diff --git a/threadutil/src/ThreadPool.c b/threadutil/src/ThreadPool.c
index 0161546..21fde9c 100644
--- a/threadutil/src/ThreadPool.c
+++ b/threadutil/src/ThreadPool.c
@@ -391,7 +391,7 @@ static void SetSeed()
  	srand( ( unsigned int )t.tv_usec + (unsigned int)ithread_get_current_thread_id().p );
 #elif defined(__FreeBSD__) || defined(__OSX__) || defined(__APPLE__)
  	srand( ( unsigned int )t.tv_usec + (unsigned int)ithread_get_current_thread_id() );
-#elif defined(__linux__)
+#elif defined(__linux__) || defined(__sun)
  	srand( ( unsigned int )t.tv_usec + ithread_get_current_thread_id() );
 #else
 	{
diff --git a/upnp/src/api/upnpapi.c b/upnp/src/api/upnpapi.c
index 51d103a..581de2f 100644
--- a/upnp/src/api/upnpapi.c
+++ b/upnp/src/api/upnpapi.c
@@ -31,54 +31,61 @@
 
 
 #include "config.h"
+
+
+#include <sys/stat.h>
+
+
 #include <assert.h>
 #include <signal.h>
 #include <stdlib.h>
 #include <string.h>
-#include <sys/stat.h>
+
+
 #ifndef WIN32
-	#include <sys/types.h>
-	#include <sys/socket.h>
-	#include <netinet/in.h>
 	#include <arpa/inet.h>
-
-	#ifndef SPARC_SOLARIS
-//		#include <linux/if.h>
-		#include <net/if.h>
-	#else
-		#include <fcntl.h>
-		#include <net/if.h>
-		#include <sys/sockio.h>
-	#endif
-
+	#include <net/if.h>
+	#include <netinet/in.h>
 	#include <sys/ioctl.h>
+	#include <sys/param.h>
+	#include <sys/socket.h>
+	#include <sys/types.h>
 	#include <sys/utsname.h>
+
+
 	#include <unistd.h>
 
-	#include <sys/param.h>
-	#if (defined(BSD) && BSD >= 199306)
+
+	#if defined(_sun)
+		#include <sys/sockio.h>
+		#include <fcntl.h>
+	#elif defined(BSD) && BSD >= 199306
 		#include <ifaddrs.h>
 	#endif
-#endif
+#endif /* WIN32 */
+
+
 #include "upnpapi.h"
 #include "httpreadwrite.h"
+#include "membuffer.h"
 #include "ssdplib.h"
 #include "soaplib.h"
 #include "ThreadPool.h"
-#include "membuffer.h"
 
-#include "httpreadwrite.h"
 
 // Needed for GENA
 #include "gena.h"
-#include "service_table.h"
 #include "miniserver.h"
+#include "service_table.h"
+
 
 #ifdef INTERNAL_WEB_SERVER
 	#include "webserver.h"
 	#include "urlconfig.h"
 #endif // INTERNAL_WEB_SERVER
 
+
+//
 virtualDirList *pVirtualDirList;
 
 // Mutex to synchronize the subscription handling at the client side