diff --git a/data/internal/homepage.pl b/data/internal/homepage.pl
index 899e731351..8ebcdb5535 100644
--- a/data/internal/homepage.pl
+++ b/data/internal/homepage.pl
@@ -11,7 +11,7 @@ while(<P>) {
 	($login,$passwd,$uid,$gid,$gcos,$home,$shell) = split(/:/);
 
 	# cleanup gecos
-	$gcos =~ s/,+$//;
+	$gcos =~ s/,.*//;
 
 	# disable daemons
 	next if $uid <= 100;
diff --git a/en/internal/homepage.pl b/en/internal/homepage.pl
index 899e731351..8ebcdb5535 100644
--- a/en/internal/homepage.pl
+++ b/en/internal/homepage.pl
@@ -11,7 +11,7 @@ while(<P>) {
 	($login,$passwd,$uid,$gid,$gcos,$home,$shell) = split(/:/);
 
 	# cleanup gecos
-	$gcos =~ s/,+$//;
+	$gcos =~ s/,.*//;
 
 	# disable daemons
 	next if $uid <= 100;