diff --git a/ChangeLog b/ChangeLog
index 931c4933b..7d5588b6d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+1999-05-21  Assar Westerlund  <assar@sics.se>
+
+	* lib/krb5/get_default_principal.c (get_logname): also try
+ 	$USERNAME
+	
+	* lib/asn1/Makefile.am (asn1_files): add $(EXEEXT)
+
+	* lib/krb5/principal.c (USE_RESOLVER): try to define only if we
+	have a libresolv (currently by checking for res_search)
+
 1999-05-18  Johan Danielsson  <joda@pdc.kth.se>
 
 	* kdc/connect.c (handle_tcp): remove %-escapes in request
diff --git a/appl/ftp/ChangeLog b/appl/ftp/ChangeLog
index a1dea2f90..b00f8cf59 100644
--- a/appl/ftp/ChangeLog
+++ b/appl/ftp/ChangeLog
@@ -1,3 +1,12 @@
+1999-05-21  Assar Westerlund  <assar@sics.se>
+
+	* ftp/extern.h (sendrequest): update prototype
+
+	* ftp/cmds.c: update calls to sendrequest and recvrequest to send
+ 	"b" when appropriate
+
+	* ftp/ftp.c (sendrequest): add argument for mode to open file in.
+
 1999-05-08  Assar Westerlund  <assar@sics.se>
 
 	* ftpd/ftpcmd.y: rename getline -> ftpd_getline
diff --git a/appl/kx/ChangeLog b/appl/kx/ChangeLog
index 02fdeb922..5b3a185ba 100644
--- a/appl/kx/ChangeLog
+++ b/appl/kx/ChangeLog
@@ -1,3 +1,7 @@
+1999-05-21  Assar Westerlund  <assar@sics.se>
+
+	* kx.c (main): try to use $USERNAME
+
 1999-05-10  Assar Westerlund  <assar@sics.se>
 
 	* Makefile.in (SOURCES*): update sources list
diff --git a/appl/push/ChangeLog b/appl/push/ChangeLog
index 8bfbf3e9f..a3ed3a199 100644
--- a/appl/push/ChangeLog
+++ b/appl/push/ChangeLog
@@ -1,3 +1,7 @@
+1999-05-21  Assar Westerlund  <assar@sics.se>
+
+	* push.c (parse_pobox): try $USERNAME
+
 1999-05-11  Assar Westerlund  <assar@sics.se>
 
 	* push.c (do_v5): remove unused and non-working code
diff --git a/appl/rsh/ChangeLog b/appl/rsh/ChangeLog
index 9ce8a5e5d..13c6f5379 100644
--- a/appl/rsh/ChangeLog
+++ b/appl/rsh/ChangeLog
@@ -1,3 +1,7 @@
+1999-05-21  Assar Westerlund  <assar@sics.se>
+
+	* rsh.c (main): try $USERNAME
+
 1999-05-14  Assar Westerlund  <assar@sics.se>
 
 	* rshd.c (doit): afslog correctly
diff --git a/kadmin/ChangeLog b/kadmin/ChangeLog
index 7ea949107..a738277b0 100644
--- a/kadmin/ChangeLog
+++ b/kadmin/ChangeLog
@@ -1,3 +1,7 @@
+1999-05-21  Assar Westerlund  <assar@sics.se>
+
+	* server.c (handle_v5): read sendauth version correctly.
+
 1999-05-14  Assar Westerlund  <assar@sics.se>
 
 	* version4.c (error_code): try to handle really old krb4
diff --git a/lib/kadm5/ChangeLog b/lib/kadm5/ChangeLog
index 2011eaf1d..3f1e71a8f 100644
--- a/lib/kadm5/ChangeLog
+++ b/lib/kadm5/ChangeLog
@@ -1,3 +1,7 @@
+1999-05-21  Assar Westerlund  <assar@sics.se>
+
+	* init_c.c (get_cred_cache): use $USERNAME
+
 1999-05-05  Johan Danielsson  <joda@pdc.kth.se>
 
 	* send_recv.c: cleanup _kadm5_client_{send,recv}