diff --git a/CHANGES b/CHANGES
index 4af80fe3b..a43f0f04b 100644
--- a/CHANGES
+++ b/CHANGES
@@ -7,6 +7,10 @@
                                   Changelog
 
 
+Daniel Stenberg (13 Jan 2009)
+- Stefan Teleman brought a patch to fix the default curlbuild.h file for the
+  SunPro compilers.
+
 Daniel Stenberg (12 Jan 2009)
 - Based on bug report #2498665 (http://curl.haxx.se/bug/view.cgi?id=2498665)
   by Daniel Black, I've now added magic to the configure script that makes it
diff --git a/TODO-RELEASE b/TODO-RELEASE
index b2f68b51d..4dc2eff81 100644
--- a/TODO-RELEASE
+++ b/TODO-RELEASE
@@ -1,6 +1,20 @@
 To be addressed in 7.19.3 (planned release: January 2009)
 =========================
 
+ * curlbuild.h patch for Sun Compiler
+
+ * [PATCH] TFTP: Fix Connect and Transfer Timeout Behavior
+
+ * Building and using static libcurl on Windows with VS2008
+
+ * Updated libcurl VS2008 Guide
+
+ * [PATCH] Curl_cookie_clearsess segfaults on new handle
+
+ * bug #2501457 "Timeouts not working with curl_multi_socket_action()" -
+   most probably subject for addition to docs/KNOWN_BUGS
+
+
 [nothing]
 
 To be addressed in 7.19.4 (planned release: March 2009)
@@ -10,6 +24,6 @@ To be addressed in 7.19.4 (planned release: March 2009)
 
 206 - A. Craig West's CURLOPT_HTTP_VERSION change for CONNECT
 
-207 - Vitaliy Kulikov's Callback for cert verification
+208 - Patch to allow GSSAPI authentication to a socks5 server
 
-208 -
+209 - 
diff --git a/include/curl/curlbuild.h.dist b/include/curl/curlbuild.h.dist
index cabe8c645..fe38f0f59 100644
--- a/include/curl/curlbuild.h.dist
+++ b/include/curl/curlbuild.h.dist
@@ -438,6 +438,32 @@
 #    endif
 #  endif
 
+/* ===================================== */
+/*    SunPro Compilers                   */
+/* ===================================== */
+
+#elif defined(__SUNPRO_C) || defined(__SUNPRO_CC)
+#include <sys/types.h>
+#include <stdint.h>
+
+#  define CURL_TYPEOF_CURL_OFF_T off_t
+#  define CURL_SIZEOF_CURL_OFF_T 8
+#  if defined(__amd64) || defined(__sparcv9)
+#     define CURL_SIZEOF_LONG 8
+#     define CURL_FORMAT_CURL_OFF_T  "ld"
+#     define CURL_FORMAT_CURL_OFF_TU "lu"
+#     define CURL_FORMAT_OFF_T       "%ld"
+#     define CURL_SUFFIX_CURL_OFF_T L
+#     define CURL_SUFFIX_CURL_OFF_TU UL
+#  else
+#     define CURL_SIZEOF_LONG 4
+#     define CURL_FORMAT_CURL_OFF_T  "lld"
+#     define CURL_FORMAT_CURL_OFF_TU "llu"
+#     define CURL_FORMAT_OFF_T       "%lld"
+#     define CURL_SUFFIX_CURL_OFF_T LL
+#     define CURL_SUFFIX_CURL_OFF_TU ULL
+#  endif
+
 /* ===================================== */
 /*    KEEP MSVC THE PENULTIMATE ENTRY    */
 /* ===================================== */