2 files changed, 3 insertions, 1 deletions

diff --git a/debian/changelog b/debian/changelog
index a9f2c5c8a..539e9d4b8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,8 @@ openssh (1:3.9p1-2) UNRELEASED; urgency=low
   * Remove pam_nologin from /etc/pam.d/ssh, as sshd's built-in support
     appears to be sufficient and more useful (closes: #162996).
   * Depend on debconf | debconf-2.0.
+  * Drop LoginGraceTime back to the upstream default of two minutes on new
+    installs (closes: #289573).
   * debconf template translations:
     - Update Greek (thanks, Logiotatidis George).
     - Update Spanish (thanks, Santiago Erquicia).
diff --git a/debian/openssh-server.postinst b/debian/openssh-server.postinst
index 15e43f1a4..3fce8af1c 100644
--- a/debian/openssh-server.postinst
+++ b/debian/openssh-server.postinst
@@ -210,7 +210,7 @@ SyslogFacility AUTH
 LogLevel INFO
 
 # Authentication:
-LoginGraceTime 600
+LoginGraceTime 120
 PermitRootLogin yes
 StrictModes yes