diff --git a/CHANGES b/CHANGES
index c7c65ec24c3d6dea198917caa0a66ebcb451abf7..7bdbecf09c6a1d0f5dc4d8fb4bf5fa78843a08de 100644
--- a/CHANGES
+++ b/CHANGES
@@ -4,6 +4,9 @@
 
  Changes between 0.9.4 and 0.9.5  [xx XXX 2000]
 
+  *) In bntest.c don't call BN_rand with zero bits argument.
+     [Steve Henson, pointed out by Andrew W. Gray <agray@iconsinc.com>]
+
   *) BN_mul bugfix: In bn_mul_part_recursion() only the a>a[n] && b>b[n]
      case was implemented. This caused BN_div_recp() to fail occasionally.
      [Ulf Möller]
diff --git a/crypto/bn/bntest.c b/crypto/bn/bntest.c
index 2a45c3a9ca8056ff131d1571a37ad6227df18ae5..41c22f5954d072f1186397ff117fe283650bea46 100644
--- a/crypto/bn/bntest.c
+++ b/crypto/bn/bntest.c
@@ -506,7 +506,7 @@ int test_mul(BIO *bp)
 
 	for (i=0; i<num0+num1; i++)
 		{
-		if (i < num1)
+		if (i <= num1)
 			{
 			BN_rand(&a,100,0,0);
 			BN_rand(&b,100,0,0);