diff --git a/ChangeLog b/ChangeLog
index f88d5499..d0e9a8db 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2008-05-05  Federico Di Gregorio  <fog@initd.org>
+
+	* Fixed sun build problem by adding "sun" to config.h checks. 
+
 2006-09-01  Federico Di Gregorio  <fog@initd.org>
 
 	* psycopg/connection_type.c: merged in double mutex destroy patch
diff --git a/psycopg/config.h b/psycopg/config.h
index 9c661ff9..db9f2844 100644
--- a/psycopg/config.h
+++ b/psycopg/config.h
@@ -129,7 +129,7 @@ static struct tm *localtime_r(time_t *t, struct tm *tm)
 #define inline
 #endif
 
-#if defined(__FreeBSD__) || (defined(_WIN32) && !defined(__GNUC__)) || defined(__sun__)
+#if defined(__FreeBSD__) || (defined(_WIN32) && !defined(__GNUC__)) || defined(__sun__) || defined(sun)
 /* what's this, we have no round function either? */
 static double round(double num)
 {