diff --git a/configfile.c b/configfile.c
index 72aa088..6246619 100644
--- a/configfile.c
+++ b/configfile.c
@@ -123,9 +123,12 @@ int config_parse(char *config)
 			break;
 		}
 
-		if ((tok = strtok(row, " \n")) && (tok2 = strtok(NULL, " \n")))
-			if (!config_add_tupel(section, tok, tok2))
-				log_print(LOG_WARN, "config_parse(): invalid row %d", i);
+		if ((tok = strtok(row, " \n"))) {
+			while ((tok2 = strtok(NULL, " \n"))) {
+				if (!config_add_tupel(section, tok, tok2))
+					log_print(LOG_WARN, "config_parse(): invalid row %d", i);
+			}
+		}
 	}
 
 	fclose(fz);