diff --git a/lib/krb5/config_file.c b/lib/krb5/config_file.c
index 1c9895775..5155aa856 100644
--- a/lib/krb5/config_file.c
+++ b/lib/krb5/config_file.c
@@ -87,6 +87,8 @@ parse_list(FILE *f, unsigned *lineno, krb5_config_binding **parent)
 	if (buf[strlen(buf) - 1] == '\n')
 	    buf[strlen(buf) - 1] = '\0';
 	p = buf;
+	if (*p == '#')
+	    continue;
 	while(isspace(*p))
 	    ++p;
 	if (*p == '}')
@@ -165,6 +167,8 @@ krb5_config_parse_file (const char *fname, krb5_config_section **res)
 	if(buf[strlen(buf) - 1] == '\n')
 	    buf[strlen(buf) - 1] = '\0';
 	p = buf;
+	if (*p == '#')
+	    continue;
 	while(isspace(*p))
 	    ++p;
 	if (*p == '[') {