diff --git a/ChangeLog b/ChangeLog
index c7bda6bf7..3a8d77f94 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -8,6 +8,7 @@ API Changes
    * net_connect() and net_bind() have a new 'proto' argument to choose
      between TCP and UDP, using the macros NET_PROTO_TCP or NET_PROTO_UDP.
    * ssl_set_bio() now requires that p_send == p_recv.
+   * ssl_set_bio() is deprecated in favor of ssl_set_bio_timeout().
 
 = PolarSSL 1.3.9 released 2014-10-20
 Security
diff --git a/include/polarssl/ssl.h b/include/polarssl/ssl.h
index ad77270c3..da95a9ff1 100644
--- a/include/polarssl/ssl.h
+++ b/include/polarssl/ssl.h
@@ -1166,6 +1166,8 @@ void ssl_set_dbg( ssl_context *ssl,
  * \warning        It is required that p_recv == p_send. Otherwise, the first
  *                 attempt at sending or receiving will result in a
  *                 POLARSSL_ERR_SSL_BAD_INPUT_DATA error.
+ *
+ * \deprecated     Superseded by ssl_set_bio_timeout().
  */
 void ssl_set_bio( ssl_context *ssl,
         int (*f_recv)(void *, unsigned char *, size_t), void *p_recv,