diff --git a/CHANGELOG b/CHANGELOG
index 32ecb62..bc0869a 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -28,6 +28,10 @@ version 2.64
 	    Add --max-cache-ttl option. Thanks to Dennis Kaarsemaker
 	    for the patch.
 
+	    Fix breakage of --host-record parsing, resulting in
+	    infinte loop at startup. Regression in 2.63. Thanks to
+	    Haim Gelfenbeyn for spotting this.
+
 	    
 version 2.63
             Do duplicate dhcp-host address check in --test mode.
diff --git a/src/option.c b/src/option.c
index 91bf59e..8c7bfbf 100644
--- a/src/option.c
+++ b/src/option.c
@@ -3164,10 +3164,10 @@ static int one_opt(int option, char *arg, char *errstr, char *gen_err, int comma
 		    for (tmp = new->names; tmp->next; tmp = tmp->next);
 		    tmp->next = nl;
 		  }
-		
-		arg = comma;
-		comma = split(arg);
 	      }
+	    
+	    arg = comma;
+	    comma = split(arg);
 	  }
 
 	/* Keep list order */