diff --git a/src/keyexchange.c b/src/keyexchange.c
index 30317cc0eb36a2a09e3adbe87580b1a2e182beb6..d8914c0dee89e6cfbf0ebe6ae15e4dcaece06857 100644
--- a/src/keyexchange.c
+++ b/src/keyexchange.c
@@ -559,7 +559,7 @@ struct make_kexinit *make_test_kexinit(struct randomness *r)
      make_int_list(1, ATOM_DIFFIE_HELLMAN_GROUP1_SHA1, -1),
      make_int_list(1, ATOM_SSH_DSS, -1),
      make_int_list(2, ATOM_ARCFOUR, ATOM_NONE, -1),
-     make_int_list(1, ATOM_HMAC_SHA1, -1),
+     make_int_list(2, ATOM_HMAC_SHA1, ATOM_HMAC_MD5 -1),
      make_int_list(1, ATOM_NONE, -1),
      make_int_list(0, -1));
 }
diff --git a/src/lsh.c b/src/lsh.c
index a114ecfef99249938f7bdc751a84837ac74eb9b5..c0ee03e11a333bab18e3bb086a561bb56f71101c 100644
--- a/src/lsh.c
+++ b/src/lsh.c
@@ -170,11 +170,12 @@ int main(int argc, char **argv)
   /* No randomness is needed for verifying signatures */
   lookup = make_fake_host_db(make_dss_algorithm(NULL)); 
   kex = make_dh_client(dh, lookup);
-  algorithms = make_alist(6,
+  algorithms = make_alist(7,
 			  ATOM_ARCFOUR, &crypto_rc4_algorithm,
 			  ATOM_BLOWFISH_CBC, crypto_cbc(make_blowfish()),
 			  ATOM_3DES_CBC, crypto_cbc(make_des3()),
 			  ATOM_HMAC_SHA1, make_hmac_algorithm(&sha_algorithm),
+			  ATOM_HMAC_MD5, make_hmac_algorithm(&md5_algorithm),
 			  ATOM_DIFFIE_HELLMAN_GROUP1_SHA1, kex,
 			  ATOM_SSH_DSS, make_dss_algorithm(r), -1);
   make_kexinit = make_test_kexinit(r);
diff --git a/src/lshd.c b/src/lshd.c
index f5d96efa19d9e0a7a8fb96fcdb6e42a15c27ba13..22d30dda40635751309943704a83219578164ab3 100644
--- a/src/lshd.c
+++ b/src/lshd.c
@@ -184,11 +184,12 @@ int main(int argc, char **argv)
   dh = make_dh1(r);
   init_host_key(r); /* Initializes public_key and secret_key */
   kex = make_dh_server(dh, public_key, secret_key);
-  algorithms = make_alist(6,
+  algorithms = make_alist(7,
 			  ATOM_ARCFOUR, &crypto_rc4_algorithm,
 			  ATOM_BLOWFISH_CBC, crypto_cbc(make_blowfish()),
 			  ATOM_3DES_CBC, crypto_cbc(make_des3()),
 			  ATOM_HMAC_SHA1, make_hmac_algorithm(&sha_algorithm),
+			  ATOM_HMAC_MD5, make_hmac_algorithm(&md5_algorithm),
 			  ATOM_DIFFIE_HELLMAN_GROUP1_SHA1, kex,
 			  ATOM_SSH_DSS, make_dss_algorithm(r), -1);
   make_kexinit = make_test_kexinit(r);