diff --git a/ChangeLog b/ChangeLog
index ef57989ec..dce5464c1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,21 @@
 Sun Nov 16 02:52:20 1997  Assar Westerlund  <assar@sics.se>
 
+	* lib/krb5/mk_req_ext.c (krb5_mk_req_ext): figure out the correct
+ 	`enctype'
+
+	* lib/krb5/mk_req.c (krb5_mk_req): use `(*auth_context)->enctype'
+ 	if set.
+
+	* lib/krb5/get_cred.c: handle the case of a specific keytype
+
+	* lib/krb5/build_auth.c (krb5_build_authenticator): enctype as a
+ 	parameter instead of guessing it.
+
+	* lib/krb5/build_ap_req.c (krb5_build_ap_req): new parameter
+ 	`enctype'
+
+	* appl/test/common.c (common_setup): don't use `optarg'
+
 	* lib/krb5/keytab.c (krb5_kt_copy_entry_contents): new function
 	(krb5_kt_get_entry): retrieve the latest version if kvno == 0
 
diff --git a/appl/telnet/ChangeLog b/appl/telnet/ChangeLog
index bc3f64c5b..57ec7831b 100644
--- a/appl/telnet/ChangeLog
+++ b/appl/telnet/ChangeLog
@@ -1,5 +1,8 @@
 Sun Nov 16 04:37:02 1997  Assar Westerlund  <assar@sics.se>
 
+	* libtelnet/kerberos5.c (kerberos5_send): always ask for a session
+ 	key of type DES
+
 	* libtelnet/kerberos5.c: remove old garbage and fix call to
  	krb5_auth_con_setaddrs_from_fd