diff --git a/ChangeLog b/ChangeLog
index b8cd03252..ca696b1b4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -28,6 +28,8 @@
    - markus@cvs.openbsd.org 2003/09/29 20:19:57
      [servconf.c sshd_config]
      GSSAPICleanupCreds -> GSSAPICleanupCredentials
+ - (dtucker) [configure.ac] Don't set DISABLE_SHADOW when configuring
+   --with-pam.  ok djm@
 
 20030930
  - (bal) Fix issues in openbsd-compat/realpath.c
@@ -1263,4 +1265,4 @@
  - Fix sshd BindAddress and -b options for systems using fake-getaddrinfo.
    Report from murple@murple.net, diagnosis from dtucker@zip.com.au
 
-$Id: ChangeLog,v 1.3050 2003/10/02 06:20:54 dtucker Exp $
+$Id: ChangeLog,v 1.3051 2003/10/02 06:26:34 dtucker Exp $
diff --git a/configure.ac b/configure.ac
index 505907c30..dd22c98d4 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
-# $Id: configure.ac,v 1.168 2003/09/25 10:18:34 dtucker Exp $
+# $Id: configure.ac,v 1.169 2003/10/02 06:26:34 dtucker Exp $
 
 AC_INIT
 AC_CONFIG_SRCDIR([ssh.c])
@@ -897,7 +897,6 @@ AC_ARG_WITH(pam,
 			AC_CHECK_FUNCS(pam_getenvlist)
 			AC_CHECK_FUNCS(pam_putenv)
 
-			disable_shadow=yes
 			PAM_MSG="yes"
 
 			AC_DEFINE(USE_PAM)