diff --git a/CHANGES b/CHANGES
index be2bf0425bb1cabc4feec7972f7f8b6094fb726b..dda8a4cbc6a07bc694ed63ab9c75f5f60b1b2d23 100644
--- a/CHANGES
+++ b/CHANGES
@@ -7,6 +7,8 @@
                                   Changelog
 
 Daniel Stenberg (16 Apr 2010)
+- Jerome Vouillon made the GnuTLS SSL handshake phase non-blocking.
+
 - The recent overhaul of the SSL recv function made the GnuTLS specific code
   treat a zero returned from gnutls_record_recv() as an error, and this caused
   our HTTPS test cases to fail. We leave it to upper layer code to detect if
diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 82a9e93fa3d949f08e3100dd8bbb96fab923a114..3117bf8b77ac2a1f95b0508d7879fce08c51419d 100644
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -16,6 +16,7 @@ This release includes the following bugfixes:
  o prevent needless reverse name lookups
  o detect GSS on ancient Linux distros
  o GnuTLS: EOF caused error when it wasn't
+ o GnuTLS: SSL handshake phase is non-blocking
 
 This release includes the following known bugs:
 
@@ -24,6 +25,6 @@ This release includes the following known bugs:
 This release would not have looked like this without help, code, reports and
 advice from friends like these:
 
- Rainer Canavan, Paul Howarth
+ Rainer Canavan, Paul Howarth, Jerome Vouillon
 
         Thanks! (and sorry if I forgot to mention someone)