diff --git a/configure.in b/configure.in
index e600d99b7..b04d23fbc 100644
--- a/configure.in
+++ b/configure.in
@@ -502,6 +502,8 @@ AC_CHECK_DECLARATION([#include <stdlib.h>], optind)
 AC_CHECK_DECLARATION([#include <stdlib.h>], opterr)
 AC_CHECK_DECLARATION([#include <stdlib.h>], optopt)
 
+AC_CHECK_DECLARATION([#include <stdlib.h>], environ)
+
 dnl
 dnl Check for fields in struct utmp
 dnl
@@ -522,6 +524,12 @@ dnl
 
 AC_KRB_STRUCT_WINSIZE
 
+dnl
+dnl Check for struct spwd
+dnl
+
+AC_KRB_STRUCT_SPWD
+
 dnl
 dnl Check for sa_len in struct sockaddr
 dnl