5bd5aa2
diff --git a/sshd.c b/sshd.c
5bd5aa2
index 8dcfdf2..95b63ad 100644
5bd5aa2
--- a/sshd.c
5bd5aa2
+++ b/sshd.c
5bd5aa2
@@ -1592,6 +1592,10 @@ main(int ac, char **av)
5bd5aa2
 	parse_server_config(&options, rexeced_flag ? "rexec" : config_file_name,
5bd5aa2
 	    &cfg, NULL, NULL, NULL);
5bd5aa2
 
5bd5aa2
+	/* 'UsePAM no' is not supported in Fedora */
5bd5aa2
+	if (! options.use_pam)
5bd5aa2
+		logit("WARNING: 'UsePAM no' is not supported in Fedora and may cause several problems.");
5bd5aa2
+
5bd5aa2
 	seed_rng();
5bd5aa2
 
5bd5aa2
 	/* Fill in default values for those options not explicitly set. */
5bd5aa2
diff --git a/sshd_config b/sshd_config
5bd5aa2
index 8c16754..9f28b04 100644
5bd5aa2
--- a/sshd_config
5bd5aa2
+++ b/sshd_config
5bd5aa2
@@ -92,6 +92,8 @@ GSSAPICleanupCredentials yes
5bd5aa2
 # If you just want the PAM account and session checks to run without
5bd5aa2
 # PAM authentication, then enable this but set PasswordAuthentication
5bd5aa2
 # and ChallengeResponseAuthentication to 'no'.
5bd5aa2
+# WARNING: 'UsePAM no' is not supported in Fedora and may cause several
5bd5aa2
+# problems.
5bd5aa2
 #UsePAM no
5bd5aa2
 UsePAM yes
5bd5aa2