diff -Nru3 openssh-3.7p1/auth-pam.c openssh-patched/auth-pam.c
--- openssh-3.7p1/auth-pam.c	2003-09-16 08:00:52.000000000 +0200
+++ openssh-patched/auth-pam.c	2004-01-09 21:41:08.000000000 +0100
@@ -34,7 +34,7 @@
 RCSID("$Id: auth-pam.c,v 1.72.2.1 2003/09/16 06:00:52 djm Exp $");

 #ifdef USE_PAM
-#include <security/pam_appl.h>
+#include <pam/pam_appl.h>

 #include "auth.h"
 #include "auth-pam.h"
diff -Nru3 openssh-3.7p1/configure openssh-patched/configure
--- openssh-3.7p1/configure	2003-09-16 08:19:17.000000000 +0200
+++ openssh-patched/configure	2004-01-09 21:52:52.000000000 +0100
@@ -4674,7 +4674,7 @@
 	getopt.h glob.h ia.h lastlog.h limits.h login.h \
 	login_cap.h maillock.h netdb.h netgroup.h \
 	netinet/in_systm.h paths.h pty.h readpassphrase.h \
-	rpc/types.h security/pam_appl.h shadow.h stddef.h stdint.h \
+	rpc/types.h pam/pam_appl.h shadow.h stddef.h stdint.h \
 	strings.h sys/strtio.h sys/audit.h sys/bitypes.h sys/bsdtty.h \
 	sys/cdefs.h sys/mman.h sys/pstat.h sys/select.h sys/stat.h \
 	sys/stropts.h sys/sysmacros.h sys/time.h sys/timers.h \
@@ -8127,18 +8127,7 @@
 fi

 # Check for PAM libs
-PAM_MSG="no"
-
-# Check whether --with-pam or --without-pam was given.
-if test "${with_pam+set}" = set; then
-  withval="$with_pam"
-
-		if test "x$withval" != "xno" ; then
-			if test "x$ac_cv_header_security_pam_appl_h" != "xyes" ; then
-				{ { echo "$as_me:8138: error: PAM headers not found" >&5
-echo "$as_me: error: PAM headers not found" >&2;}
-   { (exit 1); exit 1; }; }
-			fi
+PAM_MSG="yes"

 echo "$as_me:8143: checking for dlopen in -ldl" >&5
 echo $ECHO_N "checking for dlopen in -ldl... $ECHO_C" >&6
@@ -8409,11 +8398,8 @@
 				LIBPAM="-lpam -ldl"
 			else
 				LIBPAM="-lpam"
-			fi
-
-		fi
+			fi;

-fi;

 # Check for older PAM
 if test "x$PAM_MSG" = "xyes" ; then
@@ -8425,7 +8411,7 @@
 #include "confdefs.h"

 #include <stdlib.h>
-#include <security/pam_appl.h>
+#include <pam/pam_appl.h>

 int
 main ()
@@ -14960,7 +14946,7 @@

 # Looking for programs, paths and files

-PRIVSEP_PATH=/var/empty
+PRIVSEP_PATH='${prefix}/var/empty'

 # Check whether --with-privsep-path or --without-privsep-path was given.
 if test "${with_privsep_path+set}" = set; then
diff -Nru3 openssh-3.7p1/includes.h openssh-patched/includes.h
--- openssh-3.7p1/includes.h	2003-06-29 13:23:37.000000000 +0200
+++ openssh-patched/includes.h	2004-01-09 21:28:39.000000000 +0100
@@ -147,7 +147,7 @@
 # include <rpc/types.h> /* For INADDR_LOOPBACK */
 #endif
 #ifdef USE_PAM
-# include <security/pam_appl.h>
+# include <pam/pam_appl.h>
 #endif
 #ifdef HAVE_READPASSPHRASE_H
 # include <readpassphrase.h>