diff --git a/ChangeLog b/ChangeLog
index bc8c2a24da868afd1511d816a6272f229e20879d..04aa88e0a446ddc6c1f27b254fcf65112d5eefd9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,7 @@
 
 	* src/lsh-transport.c (main_argp_parser): Configure key exchange
 	algorithms via algorithm_options.
+	* src/lshd.c (lshd_config_handler): Likewise.
 
 2012-07-12  Niels Möller  <nisse@lysator.liu.se>
 
diff --git a/src/lshd.c b/src/lshd.c
index d123772cd5d4b73a3262c8bcbadb9aedcf56ce84..3efdd61df6eec96b7c19e84a0b1e3bc2130dd6ec 100644
--- a/src/lshd.c
+++ b/src/lshd.c
@@ -972,7 +972,7 @@ lshd_config_handler(int key, uint32_t value, const uint8_t *data,
 	  }
 	  
 	ctx->super.kexinit
-	  = make_kexinit_info(make_int_list(1, ATOM_DIFFIE_HELLMAN_GROUP14_SHA1, -1),
+	  = make_kexinit_info(self->algorithms->kex_algorithms,
 			      hostkey_algorithms,
 			      self->algorithms->crypto_algorithms,
 			      self->algorithms->mac_algorithms,