diff --git a/pcbnew/dsn.cpp b/pcbnew/dsn.cpp
index aff962aa52..cbbc1d0fba 100644
--- a/pcbnew/dsn.cpp
+++ b/pcbnew/dsn.cpp
@@ -601,12 +601,22 @@ L_read:
                 goto exit;
             }
             
-            cur = next;
+            cur = start;
+            
+            // skip leading whitespace
+            while( cur<limit && isspace(*cur) )
+                ++cur;
+
+            // if the first non-blank character is #, this line is a comment.
+            if( cur<limit && *cur=='#' )
+                goto L_read;
+        }
+        else
+        {
+            // skip leading whitespace
+            while( cur<limit && isspace(*cur) )
+                ++cur;
         }
-        
-        // skip leading whitespace
-        while( cur<limit && isspace(*cur) )
-            ++cur;
 
         if( cur >= limit )
             goto L_read;