diff --git a/eeschema/sch_file_versions.h b/eeschema/sch_file_versions.h
index 6836e2d3b7..c175fa42fa 100644
--- a/eeschema/sch_file_versions.h
+++ b/eeschema/sch_file_versions.h
@@ -35,7 +35,9 @@
 //#define SEXPR_SYMBOL_LIB_FILE_VERSION  20200126  // Initial version.  Add alternate pin
                                                    // definitions.
 
-#define SEXPR_SYMBOL_LIB_FILE_VERSION  20200820
+//#define SEXPR_SYMBOL_LIB_FILE_VERSION  20200820
+
+#define SEXPR_SYMBOL_LIB_FILE_VERSION  20200827 // Remove host tag
 
 /**
  * Symbol library file version.
@@ -56,4 +58,6 @@
 
 //#define SEXPR_SCHEMATIC_FILE_VERSION 20200714  // Add alternate pin definitions.
 
-#define SEXPR_SCHEMATIC_FILE_VERSION 20200820
+//#define SEXPR_SCHEMATIC_FILE_VERSION 20200820
+
+#define SEXPR_SCHEMATIC_FILE_VERSION 20200827   // Remove host tag
diff --git a/eeschema/sch_sexpr_parser.cpp b/eeschema/sch_sexpr_parser.cpp
index 20d14e2140..cdfafd96fb 100644
--- a/eeschema/sch_sexpr_parser.cpp
+++ b/eeschema/sch_sexpr_parser.cpp
@@ -647,7 +647,10 @@ void SCH_SEXPR_PARSER::parseHeader( TSCHEMATIC_T::T aHeaderType, int aFileVersio
         NeedLEFT();
         NeedSYMBOL();
         NeedSYMBOL();
-        NeedSYMBOL();
+
+        if( m_requiredVersion < 20200827 )
+            NeedSYMBOL();
+
         NeedRIGHT();
     }
     else
diff --git a/eeschema/sch_sexpr_plugin.cpp b/eeschema/sch_sexpr_plugin.cpp
index ae96e3440b..0bcb788ea2 100644
--- a/eeschema/sch_sexpr_plugin.cpp
+++ b/eeschema/sch_sexpr_plugin.cpp
@@ -593,9 +593,8 @@ void SCH_SEXPR_PLUGIN::Format( SCH_SHEET* aSheet )
 
     wxCHECK( screen, /* void */ );
 
-    m_out->Print( 0, "(kicad_sch (version %d) (host eeschema %s)\n\n",
-                  SEXPR_SCHEMATIC_FILE_VERSION,
-                  m_out->Quotew( GetBuildVersion() ).c_str() );
+    m_out->Print( 0, "(kicad_sch (version %d) (generator eeschema)\n\n",
+                  SEXPR_SCHEMATIC_FILE_VERSION );
 
     // Root sheet must have a permanent UUID.
     // if( aSheet->IsRootSheet() && aSheet->m_Uuid.IsLegacyTimestamp() )
@@ -1437,9 +1436,8 @@ void SCH_SEXPR_PLUGIN_CACHE::Save()
 
     std::unique_ptr< FILE_OUTPUTFORMATTER > formatter( new FILE_OUTPUTFORMATTER( fn.GetFullPath() ) );
 
-    formatter->Print( 0, "(kicad_symbol_lib (version %d) (host kicad_symbol_editor %s)\n",
-                      SEXPR_SYMBOL_LIB_FILE_VERSION,
-                      formatter->Quotew( GetBuildVersion() ).c_str() );
+    formatter->Print( 0, "(kicad_symbol_lib (version %d) (generator kicad_symbol_editor)\n",
+                      SEXPR_SYMBOL_LIB_FILE_VERSION );
 
     for( auto parent : m_symbols )
     {