diff --git a/common/wildcards_and_files_ext.cpp b/common/wildcards_and_files_ext.cpp
index c13254bc60..7ecf555375 100644
--- a/common/wildcards_and_files_ext.cpp
+++ b/common/wildcards_and_files_ext.cpp
@@ -91,7 +91,6 @@ wxString AddFileExtListToFilter( const std::vector<std::string>& aExts )
 
 const std::string SchematicSymbolFileExtension( "sym" );
 const std::string SchematicLibraryFileExtension( "lib" );
-const std::string SchematicBackupFileExtension( "bak" );
 
 const std::string VrmlFileExtension( "wrl" );
 
diff --git a/eeschema/files-io.cpp b/eeschema/files-io.cpp
index fd564f5bbd..90c9ca9dad 100644
--- a/eeschema/files-io.cpp
+++ b/eeschema/files-io.cpp
@@ -94,8 +94,8 @@ bool SCH_EDIT_FRAME::SaveEEFile( SCH_SCREEN* aScreen, bool aSaveUnderNewName,
     {
         wxFileName backupFileName = schematicFileName;
 
-        // Rename the old file to a '.bak' one:
-        backupFileName.SetExt( SchematicBackupFileExtension );
+        // Rename the old file to a '-bak' suffixed one:
+        backupFileName.SetExt( schematicFileName.GetExt() + GetBackupSuffix()  );
 
         if( backupFileName.FileExists() )
             wxRemoveFile( backupFileName.GetFullPath() );