diff --git a/CHANGES b/CHANGES
index 9e46861d1..86aa4d8fa 100644
--- a/CHANGES
+++ b/CHANGES
@@ -7,6 +7,14 @@
                                   Changelog
 
 
+Yang Tse (8 Apr 2009)
+- Removed Sun compilers preprocessor block from curlbuild.h.dist, this also
+  removes it from the curlbuild.h file originally distributed by the cURL
+  project as this file is intended for systems not capable of running the
+  configure script.  For those who have been building curl out of the source
+  code curl distribution tarball provided by curl.haxx.se the change implies
+  nothing.  Previous change in this area committed 2 Apr becomes irrelevant.
+
 Daniel Stenberg (6 Apr 2009)
 - I clarified in the docs that CURLOPT_SEEKFUNCTION should return 0 on success
   and 1 on fatal errors. Previously it only mentioned non-zero on fatal
diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index b3388b219..913b1e227 100644
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -24,7 +24,7 @@ This release includes the following bugfixes:
  o missing Curl_read() and write callback result checking in TELNET transfers
  o more ciphers enabled in libcurl built to use NSS
  o properly return an error code in curl_easy_recv
- o fixed curl_off_t definition for non-configured builds with Sun compilers
+ o Sun compilers specific preprocessor block removed from curlbuild.h.dist
 
 This release includes the following known bugs:
 
diff --git a/include/curl/curlbuild.h.dist b/include/curl/curlbuild.h.dist
index bc5950df5..faf0af6f6 100644
--- a/include/curl/curlbuild.h.dist
+++ b/include/curl/curlbuild.h.dist
@@ -438,40 +438,6 @@
 #    endif
 #  endif
 
-/* ===================================== */
-/*    SunPro Compilers                   */
-/* ===================================== */
-
-#elif defined(__SUNPRO_C) || defined(__SUNPRO_CC)
-#  if defined(_LP64)
-#    define CURL_SIZEOF_LONG        8
-#    define CURL_TYPEOF_CURL_OFF_T  long
-#    define CURL_FORMAT_CURL_OFF_T  "ld"
-#    define CURL_FORMAT_CURL_OFF_TU "lu"
-#    define CURL_FORMAT_OFF_T       "%ld"
-#    define CURL_SIZEOF_CURL_OFF_T  8
-#    define CURL_SUFFIX_CURL_OFF_T  L
-#    define CURL_SUFFIX_CURL_OFF_TU UL
-#  elif defined(__STDC__) && (__STDC__ == 1)
-#    define CURL_SIZEOF_LONG        4
-#    define CURL_TYPEOF_CURL_OFF_T  long
-#    define CURL_FORMAT_CURL_OFF_T  "ld"
-#    define CURL_FORMAT_CURL_OFF_TU "lu"
-#    define CURL_FORMAT_OFF_T       "%ld"
-#    define CURL_SIZEOF_CURL_OFF_T  4
-#    define CURL_SUFFIX_CURL_OFF_T  L
-#    define CURL_SUFFIX_CURL_OFF_TU UL
-#  else
-#    define CURL_SIZEOF_LONG        4
-#    define CURL_TYPEOF_CURL_OFF_T  long long
-#    define CURL_FORMAT_CURL_OFF_T  "lld"
-#    define CURL_FORMAT_CURL_OFF_TU "llu"
-#    define CURL_FORMAT_OFF_T       "%lld"
-#    define CURL_SIZEOF_CURL_OFF_T  8
-#    define CURL_SUFFIX_CURL_OFF_T  LL
-#    define CURL_SUFFIX_CURL_OFF_TU ULL
-#  endif
-
 /* ===================================== */
 /*    KEEP MSVC THE PENULTIMATE ENTRY    */
 /* ===================================== */