diff --git a/ChangeLog b/ChangeLog
index a6617b72..cb1aea97 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2007-10-27  Christian Perrier  <bubulle@debian.org
+
+	* src/newgrp.c,	src/passwd.c, src/su.c:
+	No longer 'apologize' to users when they use incorrect passwords
+	Remove "Sorry" from programs display
+	Imported from Debian's patch 413_no-sorry-in-passwd
+
 2007-10-13  Nicolas François  <nicolas.francois@centraliens.net>
 
 	* NEWS, po/zh_CN.po: Updated Chinese translation. Imported from
diff --git a/src/newgrp.c b/src/newgrp.c
index c8ba4f4f..1f537441 100644
--- a/src/newgrp.c
+++ b/src/newgrp.c
@@ -397,7 +397,7 @@ int main (int argc, char **argv)
 			 * there is no password, print out "Sorry" and give up
 			 */
 			sleep (1);
-			fputs (_("Sorry.\n"), stderr);
+			fputs (_("No password.\n"), stderr);
 			goto failure;
 		}
 
@@ -406,7 +406,6 @@ int main (int argc, char **argv)
 				 "Invalid password for group `%s' from `%s'",
 				 group, name));
 			sleep (1);
-			fputs (_("Sorry.\n"), stderr);
 			goto failure;
 		}
 	}
diff --git a/src/passwd.c b/src/passwd.c
index 6c4cf05f..c1ea9512 100644
--- a/src/passwd.c
+++ b/src/passwd.c
@@ -350,7 +350,7 @@ static void check_password (const struct passwd *pw, const struct spwd *sp)
 	if (now < ok) {
 		fprintf (stderr,
 			 _
-			 ("Sorry, the password for %s cannot be changed yet.\n"),
+			 ("The password for %s cannot be changed yet.\n"),
 			 pw->pw_name);
 		SYSLOG ((LOG_WARN, "now < minimum age for `%s'", pw->pw_name));
 		closelog ();
diff --git a/src/su.c b/src/su.c
index 745f4766..230a68c9 100644
--- a/src/su.c
+++ b/src/su.c
@@ -140,7 +140,6 @@ static void su_failure (const char *tty)
 			 oldname[0] ? oldname : "???", name[0] ? name : "???"));
 	closelog ();
 #endif
-	puts (_("Sorry."));
 	exit (1);
 }