diff --git a/pcbnew/ioascii.cpp b/pcbnew/ioascii.cpp
index 0ce140999e..1cc8525130 100644
--- a/pcbnew/ioascii.cpp
+++ b/pcbnew/ioascii.cpp
@@ -374,7 +374,7 @@ int WinEDA_BasePcbFrame::ReadSetup( LINE_READER* aReader )
                 wxString layerName = CONV_FROM_UTF8( data );
                 GetBoard()->SetLayerName( layer, layerName );
 
-                data = strtok( NULL, " " );
+                data = strtok( NULL, " \n\r" );
                 if( data )
                 {
                     LAYER_T type = LAYER::ParseType( data );