diff --git a/src/common/ini.c b/src/common/ini.c
index 410a2843..4d09d844 100644
--- a/src/common/ini.c
+++ b/src/common/ini.c
@@ -60,14 +60,22 @@ int parse_ini(const char *file, ini_parser_fn cb,
void *data)
        }

        while(safe_fgets(line, PATH_MAX, fp)) {
-               char *key, *value;
+               char *key, *value, *comment;
                size_t line_len;

                linenum++;

+               if(line[0] == '#') {
+                       continue;
+               }
+
+               if((comment = strchr(line,'#')) != NULL) {
+                       *comment = '\0';
+               }
+
                line_len = strtrim(line);

-               if(line_len == 0 || line[0] == '#') {
+               if(line_len == 0) {
                        continue;
                }