diff --git a/debian/changelog b/debian/changelog
index 8b05db0e..abb2a710 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,7 @@ shadow (1:4.1.3-1) unstable; urgency=low
     - Fix typo in nologin(8). Closes: #513252
     - Remove old features from passwd(1). Closes: #499578
     - login: Close passwd while waiting for exit. Closes: #474318
+    - login: fix the count of login failures. Closes: #498788
     - Remove patches applied upstream (4.1.2):
       + debian/patches/434_login_stop_checking_args_after--
       + debian/patches/491_configure.in_friendly_selinux_detection
@@ -15,6 +16,7 @@ shadow (1:4.1.3-1) unstable; urgency=low
       + debian/patches/414_remove-unwise-advices
       + debian/patches/300_SHA_crypt_method
       + debian/patches/301_manpages_missing_options
+      + debian/patches/415_login_put-echoctl-back
     - Remove patches applied upstream (4.1.3):
       + debian/patches/200_Czech_binary_translation
       + debian/patches/302_remove_non_translated_polish_manpages
diff --git a/debian/patches/415_login_put-echoctl-back b/debian/patches/415_login_put-echoctl-back
deleted file mode 100644
index 726923f2..00000000
--- a/debian/patches/415_login_put-echoctl-back
+++ /dev/null
@@ -1,29 +0,0 @@
-Goal: Re-activate ECHOCTL in login
-
-Fixes: #429758
-
-Status wrt upstream: Not reported yet. 
-
-Note: Was removed by upstream in 4.0.8 with "remove dead code" comment
-
-Index: shadow-4.1.0/src/login.c
-===================================================================
---- shadow-4.1.0.orig/src/login.c
-+++ shadow-4.1.0/src/login.c
-@@ -175,6 +175,16 @@
- 	termio.c_lflag |= ISIG | ICANON | ECHO | ECHOE;
- 	termio.c_iflag |= ICRNL;
- 
-+#if defined(ECHOKE) && defined(ECHOCTL)
-+	termio.c_lflag |= ECHOKE | ECHOCTL;
-+#endif
-+#if defined(ECHOPRT) && defined(NOFLSH) && defined(TOSTOP)
-+	termio.c_lflag &= ~(ECHOPRT | NOFLSH | TOSTOP);
-+#endif
-+#ifdef ONLCR
-+	termio.c_oflag |= ONLCR;
-+#endif
-+
- 	/* leave these values unchanged if not specified in login.defs */
- 	termio.c_cc[VERASE] = getdef_num ("ERASECHAR", termio.c_cc[VERASE]);
- 	termio.c_cc[VKILL] = getdef_num ("KILLCHAR", termio.c_cc[VKILL]);
diff --git a/debian/patches/series b/debian/patches/series
index 5c83ab75..f1e6987c 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -20,6 +20,5 @@
 403_fix_PATH-MAX_hurd
 508_nologin_in_usr_sbin
 505_useradd_recommend_adduser
-415_login_put-echoctl-back
 302_vim_selinux_support
 402_cppw_selinux