diff --git a/ChangeLog b/ChangeLog
index 374a9fdb54..7ef0342bc9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -506,6 +506,8 @@ Bugfix
      Vranken.
    * Fix a numerical underflow leading to stack overflow in mpi_read_file()
      that was triggered uppon reading an empty line. Found by Guido Vranken.
+   * Fix programs/pkey/dh_server.c so that it actually works with dh_client.c.
+     Found and fixed by Martijn de Milliano.
 
 Changes
    * Clarify ECDSA documentation and improve the sample code to avoid
diff --git a/programs/pkey/dh_server.c b/programs/pkey/dh_server.c
index 83b0b44569..dbae4d762f 100644
--- a/programs/pkey/dh_server.c
+++ b/programs/pkey/dh_server.c
@@ -229,6 +229,7 @@ int main( void )
 
     memset( buf, 0, sizeof( buf ) );
 
+    n = dhm.len;
     if( ( ret = mbedtls_net_recv( &client_fd, buf, n ) ) != (int) n )
     {
         mbedtls_printf( " failed\n  ! mbedtls_net_recv returned %d\n\n", ret );