diff --git a/cvpcb/readschematicnetlist.cpp b/cvpcb/readschematicnetlist.cpp
index 82866b3945..d9da654f70 100644
--- a/cvpcb/readschematicnetlist.cpp
+++ b/cvpcb/readschematicnetlist.cpp
@@ -235,7 +235,11 @@ int WinEDA_CvpcbFrame::ReadSchematicNetlist()
         /* debut reference trouv‚ */
         for( ; ; i++ )
         {
+#if defined(KICAD_GOST)
+            if( Line[i] == ' ' )
+#else
             if( Line[i] <= ' ' )
+#endif
                 break;
             component_reference.Append( Line[i] );
         }
@@ -248,7 +252,11 @@ int WinEDA_CvpcbFrame::ReadSchematicNetlist()
 
         for( ; ; i++ )
         {
+#if defined(KICAD_GOST)
+            if( Line[i] == ' ' )
+#else
             if( Line[i] <= ' ' )
+#endif
                 break;
             component_value.Append( Line[i] );
         }
diff --git a/eeschema/class_sch_component.cpp b/eeschema/class_sch_component.cpp
index 5e7424befc..89dbe5115f 100644
--- a/eeschema/class_sch_component.cpp
+++ b/eeschema/class_sch_component.cpp
@@ -951,7 +951,11 @@ bool SCH_COMPONENT::Save( FILE* f ) const
     }
     for( ii = 0; ii < (int) strlen( Name1 ); ii++ )
     {
-        if( Name1[ii] <= ' ' )
+#if defined(KICAD_GOST)
+            if( Name1[ii] == ' ' )
+#else
+            if( Name1[ii] <= ' ' )
+#endif
             Name1[ii] = '~';
     }
 
@@ -959,7 +963,11 @@ bool SCH_COMPONENT::Save( FILE* f ) const
     {
         strncpy( Name2, CONV_TO_UTF8( m_ChipName ), sizeof( Name2 ) );
         for( ii = 0; ii < (int) strlen( Name2 ); ii++ )
+#if defined(KICAD_GOST)
+            if( Name2[ii] == ' ' )
+#else
             if( Name2[ii] <= ' ' )
+#endif
                 Name2[ii] = '~';
     }
     else