diff --git a/ChangeLog b/ChangeLog
index 7c57f2c5..1a8ca3e0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2008-02-26  Nicolas François  <nicolas.francois@centraliens.net>
+
+	* src/gpasswd.c: When a password is moved to the gshadow file, use
+	"x" instead of "x" to indicate that the password is shadowed
+	(consistency with grpconv).
+
 2008-02-26  Nicolas François  <nicolas.francois@centraliens.net>
 
 	* NEWS: Fix failures when the gshadow file is not present. Thanks
diff --git a/NEWS b/NEWS
index 5e85b879..a837bf38 100644
--- a/NEWS
+++ b/NEWS
@@ -23,6 +23,8 @@ shadow-4.1.0 -> shadow-4.1.1						UNRELEASED
     passwd entry, but no shadow entry.
 - gpasswd
   * Fix failures when the gshadow file is not present.
+  * When a password is moved to the gshadow file, use "x" instead of "x"
+    to indicate that the password is shadowed (consistency with grpconv).
 - groupadd
   * New option -p/--password to specify an encrypted password.
   * New option -r, --system for system accounts.
diff --git a/src/gpasswd.c b/src/gpasswd.c
index 9473d89c..d3192ad6 100644
--- a/src/gpasswd.c
+++ b/src/gpasswd.c
@@ -574,7 +574,7 @@ static void get_group (struct group *gr)
 		} else {
 			sg->sg_name = xstrdup (group);
 			sg->sg_passwd = gr->gr_passwd;
-			gr->gr_passwd = "!";	/* XXX warning: const */
+			gr->gr_passwd = SHADOW_PASSWD_STRING;	/* XXX warning: const */
 
 			sg->sg_mem = dup_list (gr->gr_mem);