diff --git a/ChangeLog b/ChangeLog
index 9aa18c61..871783da 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2008-07-27  Nicolas François  <nicolas.francois@centraliens.net>
+
+	* src/groupmems.c: Use xstrdup() rather than strdup().
+
 2008-07-27  Nicolas François  <nicolas.francois@centraliens.net>
 
 	* src/groupmems.c: Add parenthesis.
diff --git a/src/groupmems.c b/src/groupmems.c
index 97a319a1..e68d6872 100644
--- a/src/groupmems.c
+++ b/src/groupmems.c
@@ -86,7 +86,7 @@ static char *whoami (void)
 	struct passwd *usr = getpwuid (getuid ());
 
 	if (0 == strcmp (usr->pw_name, grp->gr_name)) {
-		return strdup (usr->pw_name);
+		return xstrdup (usr->pw_name);
 	} else {
 		return NULL;
 	}
@@ -133,11 +133,11 @@ static void process_flags (int argc, char **argv)
 	                           &option_index)) != EOF) {
 		switch (arg) {
 		case 'a':
-			adduser = strdup (optarg);
+			adduser = xstrdup (optarg);
 			++exclusive;
 			break;
 		case 'd':
-			deluser = strdup (optarg);
+			deluser = xstrdup (optarg);
 			++exclusive;
 			break;
 		case 'p':
@@ -145,7 +145,7 @@ static void process_flags (int argc, char **argv)
 			++exclusive;
 			break;
 		case 'g':
-			thisgroup = strdup (optarg);
+			thisgroup = xstrdup (optarg);
 			break;
 		case 'l':
 			list = true;