diff --git a/src/etc/login.conf b/src/etc/login.conf
index e073f06e..731445d6 100644
--- a/src/etc/login.conf
+++ b/src/etc/login.conf
@@ -1,17 +1,40 @@
-# $OpenBSD: login.conf,v 1.6 2001/06/24 23:37:30 hin Exp $
+# $OpenBSD: login.conf,v 1.7 2001/07/01 23:22:04 millert Exp $
 
 #
 # Sample login.conf file.  See login.conf(5) for details.
 #
 
-# Default authentication methods
-auth-defaults:auth=krb4-or-pwd,passwd,skey,chpass,lchpass:
+#
+# Standard authentication types:
+#
+# krb4-or-pwd	First try Kerberos IV password, then local password file
+# krb5-or-pwd	First try Kerberos V password, then local password file
+# passwd	Use only the local password file
+# krb4		Use only the Kerberos IV password
+# krb5		Use only the Kerberos V password
+# chpass	Do not authenticate, but change users password (change
+#		the kerberos password if the user has one, else change
+#		the local password)
+# lchpass	Do not login; change user's local password instead
+# skey		Use S/Key authentication
+# activ		ActivCard X9.9 token authentication
+# crypto	CRYPTOCard X9.9 token authentication
+# snk		Digital Pathways SecureNet Key authentication
+# token		Generic X9.9 token authentication
+#
 
-# Default authentication methods for ftp
-auth-ftp-defaults:auth-ftp=krb4-or-pwd,passwd,skey:
+# Default authentication methods (krb4-or-pwd by default)
+auth-defaults:auth=krb4-or-pwd,krb4,krb5-or-pwd,krb5,passwd,activ,crypto,snk,chpass,lchpass,token:
 
-#
-# Standard default entry.
+# Default authentication methods for ftp (krb4-or-pwd by default)
+auth-ftp-defaults:auth-ftp=krb4-or-pwd,krb4,krb5-or-pwd,krb5,passwd,activ,crypto,snk,token:
+
+# 
+# The default values
+# To alter the default authentication types change the line:
+#	:tc=auth-defaults:\
+# to be read something like: (enables passwd, "myauth", and activ)
+#	:auth=passwd,myauth,activ:\
 # Any value changed in the daemon class should be reset in default
 # class.
 #