diff --git a/ChangeLog b/ChangeLog
index 7a36475d3..832b1609b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -14,6 +14,7 @@
      [readconf.c readconf.h ssh_config ssh_config.5 sshconnect.c]
      add a ConnectTimeout option to ssh, based on patch from
      Jean-Charles Longuet (jclonguet at free.fr); portable #207 ok markus@
+ - (djm) Add warning for UsePAM when built without PAM support
 
 20030515
  - (djm) OpenBSD CVS Sync
@@ -1545,4 +1546,4 @@
      save auth method before monitor_reset_key_state(); bugzilla bug #284;
      ok provos@
 
-$Id: ChangeLog,v 1.2727 2003/05/16 01:39:04 djm Exp $
+$Id: ChangeLog,v 1.2728 2003/05/16 01:42:35 djm Exp $
diff --git a/servconf.c b/servconf.c
index f37193a8f..a737f4b46 100644
--- a/servconf.c
+++ b/servconf.c
@@ -131,11 +131,7 @@ fill_default_server_options(ServerOptions *options)
 {
 	/* Portable-specific options */
 	if (options->use_pam == -1)
-#ifdef USE_PAM
 		options->use_pam = 1;
-#else
-		options->use_pam = 0;
-#endif
 
 	/* Standard Options */
 	if (options->protocol == SSH_PROTO_UNKNOWN)
@@ -299,7 +295,11 @@ static struct {
 	ServerOpCodes opcode;
 } keywords[] = {
 	/* Portable-specific options */
+#ifdef USE_PAM
 	{ "UsePAM", sUsePAM },
+#else
+	{ "UsePAM", sUnsupported },
+#endif
 	/* Standard Options */
 	{ "port", sPort },
 	{ "hostkey", sHostKeyFile },