diff --git a/CHANGES b/CHANGES
index 201400c0b7b4e9ca640004ef2bb3320965851fda..c7014e9241550231c64a1a8ab347b9446303aef0 100644
--- a/CHANGES
+++ b/CHANGES
@@ -4,6 +4,11 @@
 
  Changes between 0.9.5a and 0.9.6  [xx XXX 2000]
 
+  *) For consistency with other BIO_puts implementations, call
+     buffer_write(b, ...) directly in buffer_puts instead of calling
+     BIO_write(b, ...).
+     [Peter.Sylvester@EdelWeb.fr]
+
   *) Fix BN_mul_word for the case where the word is 0. (We have to use
      BN_zero, we may not return a BIGNUM with an array consisting of
      words set to zero.)
diff --git a/crypto/bio/b_print.c b/crypto/bio/b_print.c
index 349109b2130e48615d8753dd91f07941f31146ff..c421934def947a179c7a0e3fc0aeb96568f6090c 100644
--- a/crypto/bio/b_print.c
+++ b/crypto/bio/b_print.c
@@ -827,7 +827,7 @@ int BIO_vprintf (BIO *bio, const char *format, va_list args)
 #ifdef USE_ALLOCATING_PRINT
 	char *hugebuf;
 #else
-	MS_STATIC char hugebuf[1024*2]; /* 10k in one chunk is the limit */
+	MS_STATIC char hugebuf[1024*2];
 #endif
 
 #ifndef USE_ALLOCATING_PRINT
diff --git a/crypto/bio/bf_buff.c b/crypto/bio/bf_buff.c
index c65dc142a5c3af239d4c8dbe145c95212679f1a3..f50e8f98a3dababc89e12c63de8ddb8a4b83f770 100644
--- a/crypto/bio/bf_buff.c
+++ b/crypto/bio/bf_buff.c
@@ -506,6 +506,6 @@ static int buffer_gets(BIO *b, char *buf, int size)
 
 static int buffer_puts(BIO *b, const char *str)
 	{
-	return(BIO_write(b,str,strlen(str)));
+	return(buffer_write(b,str,strlen(str)));
 	}