diff --git a/CHANGELOG b/CHANGELOG
index 075fe1a..6bb566d 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,8 @@
+version 2.79
+	Fix parsing of CNAME arguments, which are confused by extra spaces.
+	Thanks to Diego Aguirre for spotting the bug.
+
+
 version 2.78
         Fix logic of appending ".<layer>" to PXE basename. Thanks to Chris
 	Novakovic for the patch.
diff --git a/src/option.c b/src/option.c
index f4d22a2..0698dd3 100644
--- a/src/option.c
+++ b/src/option.c
@@ -3862,7 +3862,7 @@ err:
 	    new->target = target;
 	    new->ttl = ttl;
 
-	    arg += strlen(arg)+1;
+	    for (arg += strlen(arg)+1; *arg == ' '; arg++);
 	  }
       
 	break;