diff --git a/ChangeLog b/ChangeLog
index 955fcef2e..79dc37701 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+20090504
+ - (dtucker) [sshlogin.c] Move the NO_SSH_LASTLOG #ifndef line to include
+   variable declarations.  Should prevent unused warnings anywhere it's set
+   (only Crays as far as I can tell) and be a no-op everywhere else.
+
 20090318
  - (tim) [configure.ac] Remove setting IP_TOS_IS_BROKEN for Cygwin. The problem
    that setsockopt(IP_TOS) doesn't work on Cygwin has been fixed since 2005.
diff --git a/sshlogin.c b/sshlogin.c
index cc35d6024..dff47b6f7 100644
--- a/sshlogin.c
+++ b/sshlogin.c
@@ -86,10 +86,10 @@ get_last_login_time(uid_t uid, const char *logname,
 static void
 store_lastlog_message(const char *user, uid_t uid)
 {
+#ifndef NO_SSH_LASTLOG
 	char *time_string, hostname[MAXHOSTNAMELEN] = "", buf[512];
 	time_t last_login_time;
 
-#ifndef NO_SSH_LASTLOG
 	if (!options.print_lastlog)
 		return;