diff --git a/appl/ftp/ftpd/ftpd.8 b/appl/ftp/ftpd/ftpd.8
index 8d800c8d2..01f6275c8 100644
--- a/appl/ftp/ftpd/ftpd.8
+++ b/appl/ftp/ftpd/ftpd.8
@@ -281,7 +281,7 @@ If Kerberos authentication is used, the user must pass valid tickets
 and the principal must be allowed to login as the remote user.
 .It
 The login name must be in the password data base, and not have a null
-password (if kerberos is used the password field is not checked).  In
+password (if Kerberos is used the password field is not checked).  In
 this case a password must be provided by the client before any file
 operations may be performed.  If the user has an OTP key, the response
 from a successful USER command will include an OTP challenge. The
diff --git a/kadmin/kadmind.8 b/kadmin/kadmind.8
index 00e858ad4..36734b83c 100644
--- a/kadmin/kadmind.8
+++ b/kadmin/kadmind.8
@@ -36,7 +36,7 @@
 .Os HEIMDAL
 .Sh NAME
 .Nm kadmind
-.Nd "server for administrative access to kerberos database"
+.Nd "server for administrative access to Kerberos database"
 .Sh SYNOPSIS
 .Nm
 .Oo Fl c Ar file \*(Ba Xo
diff --git a/kdc/kdc.8 b/kdc/kdc.8
index 549575830..aa8d5f47e 100644
--- a/kdc/kdc.8
+++ b/kdc/kdc.8
@@ -109,11 +109,11 @@ don't respond to 524 requests
 .It Xo
 .Fl -kerberos4
 .Xc
-respond to kerberos 4 requests
+respond to Kerberos 4 requests
 .It Xo
 .Fl -kerberos4-cross-realm
 .Xc
-respond to kerberos 4 requests from foreign realms.
+respond to Kerberos 4 requests from foreign realms.
 This is a known security hole and should not be enabled unless you
 understand the consequences and are willing to live with them.
 .It Xo
diff --git a/kuser/kinit.1 b/kuser/kinit.1
index 2bf72eb08..c6bb3e956 100644
--- a/kuser/kinit.1
+++ b/kuser/kinit.1
@@ -89,7 +89,7 @@
 .Op Ar principal Op Ar command
 .Sh DESCRIPTION
 .Nm
-is used to authenticate to the kerberos server as
+is used to authenticate to the Kerberos server as
 .Ar principal ,
 or if none is given, a system generated default (typically your login
 name at the default realm), and acquire a ticket granting ticket that
diff --git a/lib/kafs/kafs.3 b/lib/kafs/kafs.3
index 00ca6e856..715ef298e 100644
--- a/lib/kafs/kafs.3
+++ b/lib/kafs/kafs.3
@@ -151,10 +151,10 @@ are:
 .It yes
 use the 524 server in the realm to convert the ticket
 .It no
-use the kerberos 5 ticket directly, can be used with if the afs cell
+use the Kerberos 5 ticket directly, can be used with if the afs cell
 support 2b token.
 .It local, 2b
-convert the kerberos 5 credential to a 2b token locally (the same work
+convert the Kerberos 5 credential to a 2b token locally (the same work
 as a 2b 524 server should have done).
 .El
 .Pp
@@ -205,7 +205,7 @@ returns 1 if AFS is present in the kernel, 0 otherwise.
 .Fn krb_afslog
 and
 .Fn krb_afslog_uid
-returns 0 on success, or a kerberos error number on failure.
+returns 0 on success, or a Kerberos error number on failure.
 .Fn k_afs_cell_of_file ,
 .Fn k_pioctl ,
 .Fn k_setpag ,
diff --git a/lib/krb5/krb5.3 b/lib/krb5/krb5.3
index 1e3590eef..8e169a0ca 100644
--- a/lib/krb5/krb5.3
+++ b/lib/krb5/krb5.3
@@ -38,7 +38,7 @@
 .Sh LIBRARY
 Kerberos 5 Library (libkrb5, -lkrb5)
 .Sh DESCRIPTION
-These functions constitute the kerberos 5 library,
+These functions constitute the Kerberos 5 library,
 .Em libkrb5 .
 Declarations for these functions may be obtained from the include file
 .Pa krb5.h .
diff --git a/lib/krb5/krb5.conf.5 b/lib/krb5/krb5.conf.5
index ff8cbc62b..a11be008e 100644
--- a/lib/krb5/krb5.conf.5
+++ b/lib/krb5/krb5.conf.5
@@ -330,7 +330,7 @@ List of ports the kdc should listen to.
 .It addresses = Va "list of interfaces"
 List of addresses the kdc should bind to.
 .It enable-kerberos4 = Va BOOL
-Turn on kerberos4 support.
+Turn on Kerberos 4 support.
 .It v4-realm = Va REALM
 To what realm v4 requests should be mapped.
 .It enable-524 = Va BOOL
@@ -380,10 +380,10 @@ default string (for that principal).
 Additional special values of keytypes are:
 .Bl -tag -width "xxx" -offset indent
 .It v5
-The kerberos 5 salt
+The Kerberos 5 salt
 .Va pw-salt
 .It v4
-The kerberos 4 type
+The Kerberos 4 salt
 .Va des:pw-salt:
 .El
 .It use_v4_salt = Va BOOL
diff --git a/lib/krb5/krb5_address.3 b/lib/krb5/krb5_address.3
index c7b4e0642..0f090042d 100644
--- a/lib/krb5/krb5_address.3
+++ b/lib/krb5/krb5_address.3
@@ -56,7 +56,7 @@
 .Nm krb5_copy_addresses ,
 .Nm krb5_append_addresses ,
 .Nm krb5_make_addrport
-.Nd mange addresses in kerberos.
+.Nd mange addresses in Kerberos.
 .Sh LIBRARY
 Kerberos 5 Library (libkrb5, -lkrb5)
 .Sh SYNOPSIS
@@ -183,7 +183,7 @@ Kerberos 5 Library (libkrb5, -lkrb5)
 .Sh DESCRIPTION
 The
 .Li krb5_address
-structure holds a address that can be used in kerberos api
+structure holds a address that can be used in Kerberos API
 calls. There are help functions to set and extract address information
 of the address.
 .Pp
@@ -221,7 +221,7 @@ and after the call, it will contain the actual length of the address.
 .Fn krb5_max_sockaddr_size
 returns the max size of the
 .Li struct sockaddr
-that the kerberos library will return.
+that the Kerberos library will return.
 .Pp
 .Fn krb5_sockaddr_uninteresting
 returns
diff --git a/lib/krb5/krb5_ccache.3 b/lib/krb5/krb5_ccache.3
index 6306c44d8..80a3f4b8a 100644
--- a/lib/krb5/krb5_ccache.3
+++ b/lib/krb5/krb5_ccache.3
@@ -200,7 +200,7 @@ Kerberos 5 Library (libkrb5, -lkrb5)
 .Sh DESCRIPTION
 The
 .Li krb5_ccache
-structure holds a kerberos credential cache.
+structure holds a Kerberos credential cache.
 .Pp
 The
 .Li krb5_cc_cursor
@@ -221,7 +221,7 @@ that is directly referable.
 .Pp
 The
 .Li krb5_creds
-holds a kerberos credential, see manpage for
+holds a Kerberos credential, see manpage for
 .Xr krb5_creds 3 .
 .Pp
 .Fn krb5_cc_default_name
diff --git a/lib/krb5/krb5_data.3 b/lib/krb5/krb5_data.3
index 4672950e1..3572ff260 100644
--- a/lib/krb5/krb5_data.3
+++ b/lib/krb5/krb5_data.3
@@ -44,7 +44,7 @@
 .Nm krb5_data_realloc
 .Nm krb5_data_copy
 .Nm krb5_copy_data
-.Nd operates on the kerberos datatype krb5_data.
+.Nd operates on the Kerberos datatype krb5_data.
 .Sh LIBRARY
 Kerberos 5 Library (libkrb5, -lkrb5)
 .Sh SYNOPSIS