diff --git a/library/ssl_cli.c b/library/ssl_cli.c
index 3d5008b..570785f 100644
--- a/library/ssl_cli.c
+++ b/library/ssl_cli.c
@@ -991,7 +991,8 @@
         ssl->out_msg[5] = (unsigned char)( n      );
         i = 6;
 
-        ret = dhm_make_public( &ssl->handshake->dhm_ctx, 256,
+        ret = dhm_make_public( &ssl->handshake->dhm_ctx,
+                                mpi_size( &ssl->handshake->dhm_ctx.P ),
                                &ssl->out_msg[i], n,
                                 ssl->f_rng, ssl->p_rng );
         if( ret != 0 )
diff --git a/library/ssl_srv.c b/library/ssl_srv.c
index 209e5bd..c28716c 100644
--- a/library/ssl_srv.c
+++ b/library/ssl_srv.c
@@ -676,7 +676,9 @@
         return( ret );
     }
 
-    if( ( ret = dhm_make_params( &ssl->handshake->dhm_ctx, 256, ssl->out_msg + 4,
+    if( ( ret = dhm_make_params( &ssl->handshake->dhm_ctx,
+                                  mpi_size( &ssl->handshake->dhm_ctx.P ),
+                                  ssl->out_msg + 4,
                                   &n, ssl->f_rng, ssl->p_rng ) ) != 0 )
     {
         SSL_DEBUG_RET( 1, "dhm_make_params", ret );