diff --git a/CHANGES b/CHANGES
index 98a23e24e..1ddc75005 100644
--- a/CHANGES
+++ b/CHANGES
@@ -7,6 +7,12 @@
                                   Changelog
 
 
+Daniel (5 October)
+- Shared provided a few fixes to make libcurl build on BeOS
+  out-of-the-box. New code for BeOS-style non-blocking sockets, provided by
+  Shard and Jeremy Friesner. Modified the autoconf check for non-blocking
+  sockets to check for this kind too.
+
 Daniel (4 October)
 - Vincent Bronner pointed out that if you set CURLOPT_COOKIE for a transfer
   and then set it to NULL in a subsequent one, the previous cookie was still
diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index ca7412a48..22b63987f 100644
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -19,6 +19,7 @@ This release includes the following changes:
 
 This release includes the following bugfixes:
 
+ o builds fine on BeOS now
  o CURLOPT_COOKIE set to NULL no longer sends the previously set cookie
  o if an FTP transfer used a bad path, the next transfer could fail too
  o ares-built libcurl resolves IP-only names properly
@@ -60,6 +61,7 @@ advice from friends like these:
  Sanders, John McGowan, Henrik Storner, Jörg Mueller-Tolk, Peter Pentchev,
  Early Ehlinger, Kevin Fisk, Jurij Smakov, Bjorn Reese, Tim Bartley, David
  Kimdon, Dominick Meglio, Markus Moeller, Giuseppe Attardi, James MacMillan,
- Neil Spring, Siddhartha Prakash Jain, Jon Turner, Vincent Bronner
+ Neil Spring, Siddhartha Prakash Jain, Jon Turner, Vincent Bronner, Shard,
+ Jeremy Friesner
  
         Thanks! (and sorry if I forgot to mention someone)