diff --git a/CHANGELOG b/CHANGELOG
index c41dc39..49620d5 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -50,6 +50,7 @@
 - change mount "device" from "automount" to the map name.
 - check for buffer overflow in mount_afs.c.
 - update master map tokenizer to admit "slasify-colons" option (Capelle Bonoit).
+- update location validation to accept "_" (Fabio Olive Leite).
 
 1/9/2006 autofs-5.0.1 rc2
 -------------------------
diff --git a/modules/parse_sun.c b/modules/parse_sun.c
index 6f10a4f..c849ff3 100644
--- a/modules/parse_sun.c
+++ b/modules/parse_sun.c
@@ -691,7 +691,7 @@ static int validate_location(char *loc)
 	if (check_colon(ptr)) {
 		while (*ptr && *ptr != ':') {
 			if (!(isalnum(*ptr) ||
-			    *ptr == '-' || *ptr == '.' ||
+			    *ptr == '-' || *ptr == '.' || *ptr == '_' ||
 			    *ptr == ',' || *ptr == '(' || *ptr == ')'))
 				return 0;
 			ptr++;