diff --git a/sshd_config b/sshd_config
index 97f6f8e1c..42c3244b6 100644
--- a/sshd_config
+++ b/sshd_config
@@ -7,38 +7,48 @@ ServerKeyBits 768
 LoginGraceTime 600
 KeyRegenerationInterval 3600
 PermitRootLogin yes
+
+#
+# Loglevel replaces QuietMode and FascistLogging
+#
+LogLevel INFO
+
 #
 # Don't read ~/.rhosts and ~/.shosts files
 IgnoreRhosts yes
 StrictModes yes
-QuietMode no
 X11Forwarding yes
 X11DisplayOffset 10
 FascistLogging no
 PrintMotd yes
 KeepAlive yes
+CheckMail no
+UseLogin no
 SyslogFacility AUTH
 RhostsAuthentication no
+
 #
 # For this to work you will also need host keys in /etc/ssh/ssh_known_hosts
-RhostsRSAAuthentication no
 #
+RhostsRSAAuthentication no
+
 RSAAuthentication yes
 
 # To disable tunneled clear text passwords, change to no here!
 PasswordAuthentication yes
 PermitEmptyPasswords no
-# Uncomment to disable s/key passwords 
+
+#
+# Uncomment to disable s/key passwords (must be compiled with s/key support)
+#
 #SkeyAuthentication no
 
-# To change Kerberos options
+#
+# To change Kerberos options (must be compiled with Kerberos support)
+#
 #KerberosAuthentication no
 #KerberosOrLocalPasswd yes
 #AFSTokenPassing no
 #KerberosTicketCleanup no
-
 # Kerberos TGT Passing does only work with the AFS kaserver
 #KerberosTgtPassing yes
-
-#CheckMail yes
-#UseLogin no