diff --git a/findutils/grep.c b/findutils/grep.c
index 320655b..fec8d09 100644
--- a/findutils/grep.c
+++ b/findutils/grep.c
@@ -69,8 +69,7 @@
 	int nmatches = 0;
 
 	while ((line = get_line_from_file(file)) != NULL) {
-		if (line[strlen(line)-1] == '\n')
-			line[strlen(line)-1] = '\0';
+		chomp(line);
 		linenum++;
 		ret = regexec(&regex, line, 0, NULL, 0);
 		if (ret == 0 && !invert_search) { /* match */
diff --git a/findutils/xargs.c b/findutils/xargs.c
index 89bcfc1..f05efd9 100644
--- a/findutils/xargs.c
+++ b/findutils/xargs.c
@@ -68,8 +68,7 @@
 		char *execstr = NULL;
 
 		/* eat the newline off the filename. */
-		if (file_to_act_on[strlen(file_to_act_on)-1] == '\n')
-			file_to_act_on[strlen(file_to_act_on)-1] = '\0';
+		chomp(file_to_act_on);
 
 		/* eat blank lines */
 		if (strlen(file_to_act_on) == 0)