diff --git a/ChangeLog b/ChangeLog
index 9f00f94d..d4c6c99b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -7,6 +7,7 @@
 	* src/su.c: Cleanup check_perms_nopam().
 	* src/su.c: Merge environment setting blocks after the creation of
 	the session.
+	* src/su.c: Close the password databases together with syslog.
 
 2011-06-10  Nicolas François  <nicolas.francois@centraliens.net>
 
diff --git a/src/su.c b/src/su.c
index 3ec46c47..121b9576 100644
--- a/src/su.c
+++ b/src/su.c
@@ -868,8 +868,6 @@ int main (int argc, char **argv)
 	}
 
 	sulog (caller_tty, true, caller_name, name);	/* save SU information */
-	endpwent ();
-	endspent ();
 #ifdef USE_SYSLOG
 	if (getdef_bool ("SYSLOG_SU_ENAB")) {
 		SYSLOG ((LOG_INFO, "+ %s %s:%s", caller_tty,
@@ -1034,6 +1032,8 @@ int main (int argc, char **argv)
 		}
 	}
 
+	endpwent ();
+	endspent ();
 	/*
 	 * This is a workaround for Linux libc bug/feature (?) - the
 	 * /dev/log file descriptor is open without the close-on-exec flag