diff --git a/ChangeLog b/ChangeLog
index 6072a0479..18ed65a7a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,18 @@
+Sat Dec 25 22:23:47 1999  Assar Westerlund  <assar@juguete.sics.se>
+
+	* Release 0.2j
+
+Tue Dec 21 18:03:17 1999  Assar Westerlund  <assar@sics.se>
+
+	* lib/hdb/Makefile.am (asn1_files): add $(EXEEXT) for cygwin and
+ 	related systems
+
+	* lib/asn1/Makefile.am (asn1_files): add $(EXEEXT) for cygwin and
+ 	related systems
+
+	* include/Makefile.am (krb5-types.h): add $(EXEEXT) for cygwin and
+ 	related systems
+
 1999-12-20  Assar Westerlund  <assar@sics.se>
 
 	* Release 0.2i
diff --git a/configure.in b/configure.in
index aec68488d..4f9c1cc66 100644
--- a/configure.in
+++ b/configure.in
@@ -3,7 +3,7 @@ AC_REVISION($Revision$)
 AC_INIT(lib/krb5/send_to_kdc.c)
 AM_CONFIG_HEADER(include/config.h)
 
-AM_INIT_AUTOMAKE(heimdal,0.2i)
+AM_INIT_AUTOMAKE(heimdal,0.2j)
 
 AC_PREFIX_DEFAULT(/usr/heimdal)
 
@@ -730,6 +730,8 @@ AC_HAVE_TYPE([sa_family_t],[#include <sys/socket.h>])
 
 AC_HAVE_TYPE([socklen_t],[#include <sys/socket.h>])
 
+AC_HAVE_TYPE([struct sockaddr], [#include <sys/socket.h>])
+
 AC_HAVE_TYPE([struct sockaddr_storage], [#include <sys/socket.h>])
 
 AC_HAVE_TYPE([struct addrinfo], [#include <netdb.h>])