diff --git a/ChangeLog b/ChangeLog
index 3b79b5d29..fdce70566 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -4,6 +4,7 @@
    otherwise have been retrievable via getsockopt(). A hack to limit writes
    to TTYs on AIX was triggering this. Since only AIX needs the hack, wrap
    it in an #ifdef. Diagnosis and patch from Ivo Raisr.
+ - (djm) [sshlogin.h] Fix prototype merge botch from 2006; bz#2134
 
 20130725
  - (djm) OpenBSD CVS Sync
diff --git a/sshlogin.h b/sshlogin.h
index 500d3fefd..52119a979 100644
--- a/sshlogin.h
+++ b/sshlogin.h
@@ -15,7 +15,7 @@
 void	record_login(pid_t, const char *, const char *, uid_t,
     const char *, struct sockaddr *, socklen_t);
 void   record_logout(pid_t, const char *, const char *);
-time_t	get_last_login_time(uid_t, const char *, char *, u_int);
+time_t	get_last_login_time(uid_t, const char *, char *, size_t);
 
 #ifdef LOGIN_NEEDS_UTMPX
 void	record_utmp_only(pid_t, const char *, const char *, const char *,