diff --git a/ChangeLog b/ChangeLog
index c6b14ea71..2c83cb199 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,30 @@
 1999-08-04  Assar Westerlund  <assar@sics.se>
 
+	* lib/krb5/get_in_tkt.c: type correctness
+
+	* lib/krb5/get_for_creds.c (krb5_fwd_tgs_creds): set forwarded in
+ 	flags.  From Miroslav Ruda <ruda@ics.muni.cz>
+
+	* kuser/kinit.c (main): add config file support for forwardable
+ 	and krb4 support.  From Miroslav Ruda <ruda@ics.muni.cz>
+
+	* kdc/kerberos5.c (as_rep): add an empty X500-compress string as
+ 	transited.
+	(fix_transited_encoding): check length.
+	From Miroslav Ruda <ruda@ics.muni.cz>
+
+	* kdc/hpropd.c (dump_krb4): check the realm so that we don't dump
+ 	principals in some other realm. From Miroslav Ruda
+ 	<ruda@ics.muni.cz>
+	(main): rename sa_len -> sin_len, sa_lan is a define on some
+	platforms.
+
+	* appl/kf/kfd.c: add regpag support. From Miroslav Ruda
+ 	<ruda@ics.muni.cz>
+
+	* appl/kf/kf.c: add `-G' and forwardable option in krb5.conf.
+  	From Miroslav Ruda <ruda@ics.muni.cz>
+
 	* lib/krb5/config_file.c (parse_list): don't run past end of line
 
 	* appl/test/gss_common.h: new prototypes
diff --git a/appl/login/ChangeLog b/appl/login/ChangeLog
index 2d6e6e9b3..cedb64eab 100644
--- a/appl/login/ChangeLog
+++ b/appl/login/ChangeLog
@@ -1,3 +1,17 @@
+1999-08-04  Assar Westerlund  <assar@sics.se>
+
+	* utmpx_login.c (utmpx_login): fix for Solaris.  From Miroslav
+ 	Ruda <ruda@ics.muni.cz>
+
+	* login_locl.h: add <shadow.h> and some prototypes
+
+	* login.c: fixes with v4 and shadow support.  From Miroslav Ruda
+ 	<ruda@ics.muni.cz>
+
+	* shadow.c: new file with functions for handling shadow passwords
+
+	* Makefile.am: add shadow
+
 1999-07-22  Assar Westerlund  <assar@sics.se>
 
 	* login.c (main): generate a better tty name
diff --git a/appl/rsh/ChangeLog b/appl/rsh/ChangeLog
index 9d39ad4d9..2a28edbc9 100644
--- a/appl/rsh/ChangeLog
+++ b/appl/rsh/ChangeLog
@@ -1,5 +1,12 @@
 1999-08-04  Assar Westerlund  <assar@sics.se>
 
+	* rshd.c: re-write the handling of forwarded credentials and
+ 	stuff.  From Miroslav Ruda <ruda@ics.muni.cz>
+
+	* rsh_locl.h: always include kafs.h
+
+	* rsh.c: add `-z' and `-G' options
+
 	* rsh.c (loop): shutdown one side of the TCP connection on EOF.
   	From Brian A May <bmay@dgs.monash.edu.au>
 
diff --git a/appl/telnet/ChangeLog b/appl/telnet/ChangeLog
index 139a920ec..e2e7cfe98 100644
--- a/appl/telnet/ChangeLog
+++ b/appl/telnet/ChangeLog
@@ -1,5 +1,8 @@
 1999-08-04  Assar Westerlund  <assar@sics.se>
 
+	* telnet/main.c: add -G and config file support.  From Miroslav
+ 	Ruda <ruda@ics.muni.cz>
+
 	* telnetd/sys_term.c (rmut): work around utmpx strangness.  From
  	Miroslav Ruda <ruda@ics.muni.cz>
 
diff --git a/lib/auth/ChangeLog b/lib/auth/ChangeLog
index ce2eccc07..1a91d4ad5 100644
--- a/lib/auth/ChangeLog
+++ b/lib/auth/ChangeLog
@@ -1,3 +1,8 @@
+1999-08-04  Assar Westerlund  <assar@sics.se>
+
+	* afskauthlib/verify.c: incorporate patches from Miroslav Ruda
+ 	<ruda@ics.muni.cz>
+
 Thu Apr  8 14:35:34 1999  Johan Danielsson  <joda@hella.pdc.kth.se>
 
 	* sia/sia.c: remove definition of KRB_VERIFY_USER (moved to
diff --git a/lib/gssapi/ChangeLog b/lib/gssapi/ChangeLog
index 64531e89f..ef52b096d 100644
--- a/lib/gssapi/ChangeLog
+++ b/lib/gssapi/ChangeLog
@@ -1,3 +1,8 @@
+1999-08-04  Assar Westerlund  <assar@sics.se>
+
+	* display_status.c (calling_error, routine_error): right shift the
+ 	code to make it possible to index into the arrays
+
 1999-07-28  Assar Westerlund  <assar@sics.se>
 
 	* gssapi.h (GSS_C_AF_INET6): add
diff --git a/lib/gssapi/krb5/ChangeLog b/lib/gssapi/krb5/ChangeLog
index 64531e89f..ef52b096d 100644
--- a/lib/gssapi/krb5/ChangeLog
+++ b/lib/gssapi/krb5/ChangeLog
@@ -1,3 +1,8 @@
+1999-08-04  Assar Westerlund  <assar@sics.se>
+
+	* display_status.c (calling_error, routine_error): right shift the
+ 	code to make it possible to index into the arrays
+
 1999-07-28  Assar Westerlund  <assar@sics.se>
 
 	* gssapi.h (GSS_C_AF_INET6): add