diff --git a/kerberos5/include/config.h b/kerberos5/include/config.h
index caeca1665c1d..05a13d0ce1af 100644
--- a/kerberos5/include/config.h
+++ b/kerberos5/include/config.h
@@ -91,11 +91,17 @@
 /* Define if you have the <bsdsetjmp.h> header file. */
 /* #undef HAVE_BSDSETJMP_H */
 
+/* Define if you have the `bswap16' function. */
+/* #undef HAVE_BSWAP16 */
+
+/* Define if you have the `bswap32' function. */
+/* #undef HAVE_BSWAP32 */
+
 /* Define if you have the <capability.h> header file. */
 /* #undef HAVE_CAPABILITY_H */
 
 /* Define if you have the `cap_set_proc' function. */
-/* #undef HAVE_CAP_SET_PROC */
+#define HAVE_CAP_SET_PROC 1
 
 /* Define if you have the `cgetent' function. */
 #define HAVE_CGETENT 1
@@ -259,6 +265,9 @@
 /* Define if you have the `getopt' function. */
 #define HAVE_GETOPT 1
 
+/* Define if you have the `getprogname' function. */
+#define HAVE_GETPROGNAME 1
+
 /* Define if you have the `getpwnam_r' function. */
 /* #undef HAVE_GETPWNAM_R */
 
@@ -284,7 +293,7 @@
 #define HAVE_GETUSERSHELL 1
 
 /* define if you have a glob() that groks GLOB_BRACE, GLOB_NOCHECK,
-   GLOB_QUOTE, and GLOB_TILDE */
+   GLOB_QUOTE, GLOB_TILDE, and GLOB_LIMIT */
 #define HAVE_GLOB 1
 
 /* Define if you have the `grantpt' function. */
@@ -329,6 +338,9 @@
 /* Define if you have the `initgroups' function. */
 #define HAVE_INITGROUPS 1
 
+/* Define if you have the `initstate' function. */
+#define HAVE_INITSTATE 1
+
 /* Define if you have the `innetgr' function. */
 #define HAVE_INNETGR 1
 
@@ -377,9 +389,6 @@
 /* Define if you have the `memmove' function. */
 #define HAVE_MEMMOVE 1
 
-/* Define if you have the <memory.h> header file. */
-#define HAVE_MEMORY_H 1
-
 /* Define if you have the `mkstemp' function. */
 #define HAVE_MKSTEMP 1
 
@@ -557,6 +566,9 @@
 /* Define if you have the `setproctitle' function. */
 #define HAVE_SETPROCTITLE 1
 
+/* Define if you have the `setprogname' function. */
+#define HAVE_SETPROGNAME 1
+
 /* Define if you have the `setregid' function. */
 #define HAVE_SETREGID 1
 
@@ -575,6 +587,9 @@
 /* Define if you have the `setsockopt' function. */
 #define HAVE_SETSOCKOPT 1
 
+/* Define if you have the `setstate' function. */
+#define HAVE_SETSTATE 1
+
 /* Define if you have the `setutent' function. */
 /* #undef HAVE_SETUTENT */
 
@@ -611,9 +626,6 @@
 /* Define if you have the <standards.h> header file. */
 /* #undef HAVE_STANDARDS_H */
 
-/* Define if you have the <stdlib.h> header file. */
-#define HAVE_STDLIB_H 1
-
 /* Define if you have the `strcasecmp' function. */
 #define HAVE_STRCASECMP 1
 
@@ -626,12 +638,6 @@
 /* Define if you have the `strftime' function. */
 #define HAVE_STRFTIME 1
 
-/* Define if you have the <strings.h> header file. */
-#define HAVE_STRINGS_H 1
-
-/* Define if you have the <string.h> header file. */
-#define HAVE_STRING_H 1
-
 /* Define if you have the `strlcat' function. */
 #define HAVE_STRLCAT 1
 
@@ -755,6 +761,9 @@
 /* Define if you have the <sys/bitypes.h> header file. */
 /* #undef HAVE_SYS_BITYPES_H */
 
+/* Define if you have the <sys/bswap.h> header file. */
+/* #undef HAVE_SYS_BSWAP_H */
+
 /* Define if you have the <sys/capability.h> header file. */
 #define HAVE_SYS_CAPABILITY_H 1
 
@@ -1117,7 +1126,7 @@
 /* #undef TM_IN_SYS_TIME */
 
 /* Version number of package */
-#define VERSION "0.3e"
+#define VERSION "0.3f"
 
 /* Define if signal handlers return void. */
 #define VOID_RETSIGTYPE 1
diff --git a/kerberos5/include/version.h b/kerberos5/include/version.h
index 26fc6c845f94..09f2fba711d8 100644
--- a/kerberos5/include/version.h
+++ b/kerberos5/include/version.h
@@ -1,5 +1,5 @@
 /* $FreeBSD$ */
-char *krb4_long_version = "@(#)$Version: krb4-1.0.5 (FreeBSD) $";
-char *krb4_version = "krb4-1.0.5";
-const char *heimdal_long_version = "@(#)$Version: heimdal-0.3e (FreeBSD) $";
-const char *heimdal_version = "heimdal-0.3e";
+const char *krb4_long_version = "@(#)$Version: krb4-1.0.5 (FreeBSD) $";
+const char *krb4_version = "krb4-1.0.5";
+const char *heimdal_long_version = "@(#)$Version: heimdal-0.3f (FreeBSD) $";
+const char *heimdal_version = "heimdal-0.3f";
diff --git a/kerberos5/lib/Makefile.inc b/kerberos5/lib/Makefile.inc
index acd5059dc437..cd353db56373 100644
--- a/kerberos5/lib/Makefile.inc
+++ b/kerberos5/lib/Makefile.inc
@@ -1,6 +1,6 @@
 # $FreeBSD$
 
-SHLIB_MAJOR?=	3
+SHLIB_MAJOR?=	4
 SHLIB_MINOR?=	0
 
 .include "../Makefile.inc"
diff --git a/kerberos5/lib/libasn1/Makefile b/kerberos5/lib/libasn1/Makefile
index 04bd5949e005..64f865531817 100644
--- a/kerberos5/lib/libasn1/Makefile
+++ b/kerberos5/lib/libasn1/Makefile
@@ -7,7 +7,7 @@ CFLAGS+=-I${KRB5DIR}/include \
 	-I${INCLUDEOBJDIR} \
 	-I${.OBJDIR}
 SRCS=	der_get.c der_put.c der_free.c der_length.c der_copy.c \
-	timegm.c asn1_err.c asn1_err.h asn1.h roken.h \
+	timegm.c asn1_err.c asn1_err.h krb5_asn1.h roken.h \
 	${GEN:S/.x/.c/g}
 
 GEN=						\
@@ -20,6 +20,7 @@ GEN=						\
 	asn1_AuthorizationData.x		\
 	asn1_CKSUMTYPE.x			\
 	asn1_Checksum.x				\
+	asn1_ENCTYPE.x				\
 	asn1_ETYPE_INFO.x			\
 	asn1_ETYPE_INFO_ENTRY.x			\
 	asn1_EncAPRepPart.x			\
@@ -45,6 +46,7 @@ GEN=						\
 	asn1_KerberosTime.x			\
 	asn1_KrbCredInfo.x			\
 	asn1_LastReq.x				\
+	asn1_LR_TYPE.x				\
 	asn1_MESSAGE_TYPE.x			\
 	asn1_METHOD_DATA.x			\
 	asn1_NAME_TYPE.x			\
@@ -61,7 +63,7 @@ GEN=						\
 	asn1_TransitedEncoding.x		\
 	asn1_UNSIGNED.x
 
-INCLUDES=asn1.h asn1_err.h 
+INCLUDES=krb5_asn1.h asn1_err.h 
 
 .include <bsd.lib.mk>
 
@@ -79,17 +81,31 @@ ${I:S/.x/.c/}:	${I}
 	cmp -s ${.OODATE} ${.TARGET} 2> /dev/null || cp ${.OODATE} ${.TARGET}
 .endfor
 
-CLEANFILES+=	${GEN:S/.x/.c/g} asn1.h asn1_files
+CLEANFILES+=	${GEN:S/.x/.c/g} krb5_asn1.h asn1_files
 
-${GEN} asn1.h:		asn1_compile k5.asn1
-	./asn1_compile ${KRB5DIR}/lib/asn1/k5.asn1
+${GEN} krb5_asn1.h:		asn1_compile k5.asn1
+	./asn1_compile ${KRB5DIR}/lib/asn1/k5.asn1 krb5_asn1
 
 build-tools:	make-print-version asn1_compile
 
-asn1_compile:	parse.o lex.o main.c hash.c symbol.c gen.c \
-		gen_encode.c gen_decode.c gen_free.c gen_length.c \
-		gen_copy.c gen_glue.c getarg.c warnerr.c print_version.o \
-		get_window_size.c strupr.c
+asn1_compile:					\
+	gen.c					\
+	gen_copy.c				\
+	gen_decode.c				\
+	gen_encode.c				\
+	gen_free.c				\
+	gen_glue.c				\
+	gen_length.c				\
+	hash.c					\
+	lex.o					\
+	main.c					\
+	parse.o					\
+	symbol.c				\
+	getarg.c				\
+	warnerr.c				\
+	print_version.o				\
+	get_window_size.c			\
+	strupr.c
 	${CC} ${CFLAGS} ${.OODATE} -o ${.TARGET}
 
 parse.o:	parse.c roken.h
diff --git a/kerberos5/lib/libhdb/Makefile b/kerberos5/lib/libhdb/Makefile
index e8980f8cded1..ff3bb748cf61 100644
--- a/kerberos5/lib/libhdb/Makefile
+++ b/kerberos5/lib/libhdb/Makefile
@@ -48,7 +48,7 @@ ${I:S/.x/.c/}:  ${I}
 	cmp -s ${.OODATE} ${.TARGET} 2> /dev/null || cp ${.OODATE} ${.TARGET}
 .endfor
 
-CLEANFILES+=	${GEN:S/.x/.c/g} asn1.h asn1_files
+CLEANFILES+=	${GEN:S/.x/.c/g} hdb_asn1.h asn1_files
 
 ${GEN} hdb_asn1.h:	asn1_compile hdb.asn1
 	./asn1_compile ${KRB5DIR}/lib/hdb/hdb.asn1 hdb_asn1
diff --git a/kerberos5/lib/libkrb5/Makefile b/kerberos5/lib/libkrb5/Makefile
index c818687e1b5b..c0659a8e9c00 100644
--- a/kerberos5/lib/libkrb5/Makefile
+++ b/kerberos5/lib/libkrb5/Makefile
@@ -37,6 +37,7 @@ SRCS=	\
 	crypto.c \
 	data.c \
 	eai_to_heim_errno.c \
+	error_string.c \
 	expand_hostname.c \
 	fcache.c \
 	free.c \
@@ -58,6 +59,7 @@ SRCS=	\
 	init_creds_pw.c \
 	keyblock.c \
 	keytab.c \
+	keytab_any.c \
 	keytab_file.c \
 	keytab_memory.c \
 	keytab_keyfile.c \
@@ -112,6 +114,29 @@ SRCS=	\
 INCLUDES=${KRB5DIR}/lib/krb5/krb5.h ${.CURDIR}/../../include/krb5-types.h \
 	${KRB5DIR}/lib/krb5/krb5-protos.h heim_err.h krb5_err.h 
 
+MAN3=						\
+	krb5_425_conv_principal.3		\
+	krb5_appdefault.3			\
+	krb5_auth_context.3			\
+	krb5_build_principal.3			\
+	krb5_config.3				\
+	krb5_context.3				\
+	krb5_free_principal.3			\
+	krb5_init_context.3			\
+	krb5_keytab.3				\
+	krb5_openlog.3				\
+	krb5_parse_name.3			\
+	krb5_sname_to_principal.3		\
+	krb5_unparse_name.3			\
+	krb5_warn.3
+
+MAN5=						\
+	krb5.conf.5
+
+MAN8=						\
+	kerberos.8				\
+	verify_krb5_conf.8
+
 .include <bsd.lib.mk>
 
 .PATH:		${KRB5DIR}/lib/krb5
diff --git a/kerberos5/lib/libroken/Makefile b/kerberos5/lib/libroken/Makefile
index 38b3f3c62ac0..fc118e0d7a4c 100644
--- a/kerberos5/lib/libroken/Makefile
+++ b/kerberos5/lib/libroken/Makefile
@@ -8,6 +8,7 @@ CFLAGS+=	-I${KRB5DIR}/include \
 
 SRCS=		\
 	base64.c		\
+	bswap.c			\
 	concat.c		\
 	emalloc.c		\
 	environment.c		\