diff --git a/ChangeLog b/ChangeLog
index bb475e3065..691754d8b9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 PolarSSL ChangeLog
 
+= Version 1.1.3 released on 2012-04-29
+Bugfix
+   * Fixed random MPI generation to not generate more size than requested.
+
 = Version 1.1.2 released on 2012-04-26
 Bugfix
    * Fixed handling error in mpi_cmp_mpi() on longer B values (found by
diff --git a/library/bignum.c b/library/bignum.c
index e2cc06f24d..0cb95055df 100644
--- a/library/bignum.c
+++ b/library/bignum.c
@@ -1618,10 +1618,10 @@ int mpi_fill_random( mpi *X, size_t size,
 {
     int ret;
 
-    MPI_CHK( mpi_grow( X, size ) );
+    MPI_CHK( mpi_grow( X, CHARS_TO_LIMBS( size ) ) );
     MPI_CHK( mpi_lset( X, 0 ) );
 
-    MPI_CHK( f_rng( p_rng, (unsigned char *) X->p, X->n * ciL ) );
+    MPI_CHK( f_rng( p_rng, (unsigned char *) X->p, size ) );
 
 cleanup:
     return( ret );