diff --git a/ChangeLog b/ChangeLog
index 7acb76b9c..0f20d071a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -4,6 +4,7 @@
  - (dtucker) [auth-pam.c] Convert chauthtok_conv into a generic tty_conv,
    and use it for do_pam_session.  Fixes problems like pam_motd not displaying
    anything.  ok djm@
+ - (dtucker) [auth-pam.c] Only use pam_putenv if our platform has it. ok djm@
 
 20031117
  - (djm) OpenBSD CVS Sync
@@ -1479,4 +1480,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.3114 2003/11/18 01:42:07 dtucker Exp $
+$Id: ChangeLog,v 1.3115 2003/11/18 01:45:35 dtucker Exp $
diff --git a/auth-pam.c b/auth-pam.c
index af8d37fab..2594bed3d 100644
--- a/auth-pam.c
+++ b/auth-pam.c
@@ -31,7 +31,7 @@
 
 /* Based on $FreeBSD: src/crypto/openssh/auth2-pam-freebsd.c,v 1.11 2003/03/31 13:48:18 des Exp $ */
 #include "includes.h"
-RCSID("$Id: auth-pam.c,v 1.81 2003/11/18 01:42:08 dtucker Exp $");
+RCSID("$Id: auth-pam.c,v 1.82 2003/11/18 01:45:36 dtucker Exp $");
 
 #ifdef USE_PAM
 #include <security/pam_appl.h>
@@ -167,11 +167,13 @@ import_environments(Buffer *b)
 	for(i = 0; i < num_env; i++) {
 		env = buffer_get_string(b, NULL);
 
+#ifdef HAVE_PAM_PUTENV
 		/* Errors are not fatal here */
 		if ((err = pam_putenv(sshpam_handle, env)) != PAM_SUCCESS) {
 			error("PAM: pam_putenv: %s",
 			    pam_strerror(sshpam_handle, sshpam_err));
 		}
+#endif
 	}
 }