diff --git a/components/fpspreadsheet/source/common/fpsclasses.pas b/components/fpspreadsheet/source/common/fpsclasses.pas
index 2e03e90e5..ccaf3edb2 100644
--- a/components/fpspreadsheet/source/common/fpsclasses.pas
+++ b/components/fpspreadsheet/source/common/fpsclasses.pas
@@ -1,4 +1,4 @@
-unit fpsclasses;
+unit fpsClasses;
 
 {$mode objfpc}{$H+}
 
diff --git a/components/fpspreadsheet/source/common/fpsopendocument.pas b/components/fpspreadsheet/source/common/fpsopendocument.pas
index 9d7490e51..67bf26f61 100644
--- a/components/fpspreadsheet/source/common/fpsopendocument.pas
+++ b/components/fpspreadsheet/source/common/fpsopendocument.pas
@@ -23,7 +23,7 @@ NOTICE: Active define FPSpreadDebug in the project options to get a log during
 }
 
 
-unit fpsopendocument;
+unit fpsOpenDocument;
 
 {$ifdef fpc}
   {$mode objfpc}{$H+}
diff --git a/components/fpspreadsheet/source/common/fpspreadsheet.pas b/components/fpspreadsheet/source/common/fpspreadsheet.pas
index c65ba897a..f46289ee7 100644
--- a/components/fpspreadsheet/source/common/fpspreadsheet.pas
+++ b/components/fpspreadsheet/source/common/fpspreadsheet.pas
@@ -7,7 +7,7 @@
   LICENSE: See the file COPYING.modifiedLGPL.txt, included in the Lazarus
            distribution, for details about the license.
 -------------------------------------------------------------------------------}
-unit fpspreadsheet;
+unit fpSpreadsheet;
 
 {$ifdef fpc}
   {$mode delphi}{$H+}
diff --git a/components/fpspreadsheet/source/common/fpsutils.pas b/components/fpspreadsheet/source/common/fpsutils.pas
index 588b28f93..64812a1fd 100644
--- a/components/fpspreadsheet/source/common/fpsutils.pas
+++ b/components/fpspreadsheet/source/common/fpsutils.pas
@@ -5,7 +5,7 @@
   LICENSE: See the file COPYING.modifiedLGPL.txt, included in the Lazarus
            distribution, for details about the license.
 -------------------------------------------------------------------------------}
-unit fpsutils;
+unit fpsUtils;
 
 // to do: Remove the patched FormatDateTime when the feature of square brackets
 //        in time format codes is in the rtl
diff --git a/components/fpspreadsheet/source/common/fpsxmlcommon.pas b/components/fpspreadsheet/source/common/fpsxmlcommon.pas
index 8db007e5e..7a6cdd27f 100644
--- a/components/fpspreadsheet/source/common/fpsxmlcommon.pas
+++ b/components/fpspreadsheet/source/common/fpsxmlcommon.pas
@@ -1,7 +1,7 @@
 { fpsxmlcommon.pas
   Unit shared by all xml-type reader/writer classes }
 
-unit fpsxmlcommon;
+unit fpsXMLCommon;
 
 {$mode objfpc}{$H+}
 
diff --git a/components/fpspreadsheet/source/common/xlsbiff8.pas b/components/fpspreadsheet/source/common/xlsbiff8.pas
index ed1bac89f..8ffcb5381 100644
--- a/components/fpspreadsheet/source/common/xlsbiff8.pas
+++ b/components/fpspreadsheet/source/common/xlsbiff8.pas
@@ -217,6 +217,7 @@ type
       AWorksheet: TsBasicWorksheet): Int64;
     procedure WriteComment(AStream: TStream; ACell: PCell); override;
     procedure WriteComments(AStream: TStream; AWorksheet: TsBasicWorksheet);
+    procedure WriteConditionalFormatting(AStream: TStream; AWorksheet: TsBasicWorksheet);
     procedure WriteDefinedName(AStream: TStream; AWorksheet: TsBasicWorksheet;
        const AName: String; AIndexToREF, ASheetIndex: Word;
        AKind: TsBIFFExternKind); reintroduce;
@@ -2863,6 +2864,7 @@ begin
       WriteHyperlinks(AStream, FWorksheet);
 
       WriteMergedCells(AStream, FWorksheet);
+      WriteConditionalFormatting(AStream, FWorksheet);
 
     WriteEOF(AStream);
   end;
@@ -3119,6 +3121,15 @@ begin
   end;
 end;
 
+{@@ ----------------------------------------------------------------------------
+  Writes the records needed by Conditional Formatting
+-------------------------------------------------------------------------------}
+procedure TsSpreadBIFF8Writer.WriteConditionalFormatting(AStream: TStream;
+  AWorksheet: TsBasicWorksheet);
+begin
+  // to do: implementation: write CFHEADER and CFRULE records.
+end;
+
 {@@ ----------------------------------------------------------------------------
   Writes a DEFINEDNAME record.
   Implements only the builtin defined names for print ranges and titles!