diff --git a/components/fpspreadsheet/fpsnumformat.pas b/components/fpspreadsheet/fpsnumformat.pas
index a256b5f98..0027308a5 100644
--- a/components/fpspreadsheet/fpsnumformat.pas
+++ b/components/fpspreadsheet/fpsnumformat.pas
@@ -1,3 +1,12 @@
+{@@ ----------------------------------------------------------------------------
+  Unit fpsNumFormat contains classes and procedures to analyze and process
+  <b>number formats</b>.
+
+  AUTHORS: Werner Pamler
+
+  LICENSE: See the file COPYING.modifiedLGPL.txt, included in the Lazarus
+            distribution, for details about the license.
+-------------------------------------------------------------------------------}
 unit fpsNumFormat;
 
 {$ifdef fpc}
diff --git a/components/fpspreadsheet/fpspreadsheet.chm b/components/fpspreadsheet/fpspreadsheet.chm
index 82ac3caf3..22316f09c 100755
Binary files a/components/fpspreadsheet/fpspreadsheet.chm and b/components/fpspreadsheet/fpspreadsheet.chm differ
diff --git a/components/fpspreadsheet/fpspreadsheet.pas b/components/fpspreadsheet/fpspreadsheet.pas
index 0354d19d4..28a9f060a 100755
--- a/components/fpspreadsheet/fpspreadsheet.pas
+++ b/components/fpspreadsheet/fpspreadsheet.pas
@@ -1,7 +1,6 @@
-{ fpspreadsheet }
-
 {@@ ----------------------------------------------------------------------------
-  Unit fpspreadsheet reads and writes spreadsheet documents.
+  Unit fpspreadsheet implements <b>spreadsheet documents</b> and their
+  properties and methods.
 
   AUTHORS: Felipe Monteiro de Carvalho, Reinier Olislagers, Werner Pamler
 
diff --git a/components/fpspreadsheet/fpspreadsheetctrls.pas b/components/fpspreadsheet/fpspreadsheetctrls.pas
index a03ac59e3..817ed9d5e 100644
--- a/components/fpspreadsheet/fpspreadsheetctrls.pas
+++ b/components/fpspreadsheet/fpspreadsheetctrls.pas
@@ -1,8 +1,6 @@
-{ fpspreadsheetctrls }
-
 {@@ ----------------------------------------------------------------------------
-  Unit fpspreadsheetctrls implements some visual controls which help to create
-  a spreadsheet application without writing too much code.
+  Unit fpspreadsheetctrls implements some <b>visual controls</b> which help
+  to create a spreadsheet application without writing too much code.
 
   AUTHORS: Werner Pamler
 
@@ -10,14 +8,17 @@
            distribution, for details about the license.
 
   EXAMPLE
-  * Add a WorkbookSource component to the form.
-  * Add a WorksheetTabControl
-  * Add a WorksheetGrid (from unit fpspreadsheetgrid)
-  * Link their WorkbookSource properties to the added WorkbookSource component
-  * Set the property FileName of the WorkbookSource to a spreadsheet file.
+  * Add a <i>WorkbookSource</i> component to the form.
+  * Add a <i>WorksheetTabControl</i>
+  * Add a <i>WorksheetGrid</i> (from unit fpspreadsheetgrid)
+  * Link their <i>WorkbookSource</i> properties to the added
+    <i>WorkbookSource</i> component
+  * Set the property <i>FileName</i> of the </i>WorkbookSource</i> to a
+    spreadsheet file.
 
-  --> The WorksheetTabControl displays tabs for each worksheet in the file, and
-      the WorksheetGrid displays the worksheet according to the selected tab.
+  As a result, the <i>WorksheetTabControl</i> displays tabs for each worksheet
+  in the file, and the <i>WorksheetGrid</i> displays the worksheet according to
+  the selected tab.
 -------------------------------------------------------------------------------}
 unit fpspreadsheetctrls;
 
diff --git a/components/fpspreadsheet/fpspreadsheetgrid.pas b/components/fpspreadsheet/fpspreadsheetgrid.pas
index b54bd72ec..953b94e9d 100644
--- a/components/fpspreadsheet/fpspreadsheetgrid.pas
+++ b/components/fpspreadsheet/fpspreadsheetgrid.pas
@@ -1,14 +1,14 @@
-{ fpspreadsheetgrid }
-
 {@@ ----------------------------------------------------------------------------
-  Grid component which can load and write data from/to FPSpreadsheet documents.
+  Unit fpspreadsheet implements a <b>grid</b> component which can load and
+  write data from/to FPSpreadsheet documents.
+
   Can either be used alone or in combination with a TsWorkbookSource component.
-  The latter case requires less written code.
+  The latter method requires less written code.
 
-AUTHORS: Felipe Monteiro de Carvalho, Werner Pamler
+  AUTHORS: Felipe Monteiro de Carvalho, Werner Pamler
 
-LICENSE: See the file COPYING.modifiedLGPL.txt, included in the Lazarus
-         distribution, for details about the license.
+  LICENSE: See the file COPYING.modifiedLGPL.txt, included in the Lazarus
+           distribution, for details about the license.
 -------------------------------------------------------------------------------}
 unit fpspreadsheetgrid;
 
diff --git a/components/fpspreadsheet/fpsrpn.pas b/components/fpspreadsheet/fpsrpn.pas
index a184b13ef..11a8dd5bb 100644
--- a/components/fpspreadsheet/fpsrpn.pas
+++ b/components/fpspreadsheet/fpsrpn.pas
@@ -1,6 +1,6 @@
 {@@ ----------------------------------------------------------------------------
-  The unit fpsRPN contains methods for simple creation of an RPNFormula array
-  to be used in fpspreadsheet.
+  The unit fpsRPN contains methods for simple creation of an <b>RPNFormula</b>
+  array to be used in fpspreadsheet.
 
   AUTHORS: Werner Pamler
 
diff --git a/components/fpspreadsheet/fpstypes.pas b/components/fpspreadsheet/fpstypes.pas
index 6c48f4e0f..b08b2dc71 100644
--- a/components/fpspreadsheet/fpstypes.pas
+++ b/components/fpspreadsheet/fpstypes.pas
@@ -1,3 +1,12 @@
+{@@ ----------------------------------------------------------------------------
+  Unit fpsTypes collects the most <b>fundamental declarations</b> used
+  throughout the fpspreadsheet library.
+
+  AUTHORS: Werner Pamler
+
+  LICENSE: See the file COPYING.modifiedLGPL.txt, included in the Lazarus
+            distribution, for details about the license.
+-------------------------------------------------------------------------------}
 unit fpsTypes;
 
 {$mode objfpc}{$H+}
diff --git a/components/fpspreadsheet/fpsutils.pas b/components/fpspreadsheet/fpsutils.pas
index c966a3798..405ebfe69 100644
--- a/components/fpspreadsheet/fpsutils.pas
+++ b/components/fpspreadsheet/fpsutils.pas
@@ -1,5 +1,6 @@
 {@@ ----------------------------------------------------------------------------
-  Utility functions and declarations for FPSpreadsheet
+  Unit fpsUtils provides a variety of <b>utility functions</b> used
+  throughout the fpspreadsheet library.
 
   LICENSE: See the file COPYING.modifiedLGPL.txt, included in the Lazarus
            distribution, for details about the license.
diff --git a/components/fpspreadsheet/laz_fpspreadsheet.lpk b/components/fpspreadsheet/laz_fpspreadsheet.lpk
index b2e39f87f..176037465 100644
--- a/components/fpspreadsheet/laz_fpspreadsheet.lpk
+++ b/components/fpspreadsheet/laz_fpspreadsheet.lpk
@@ -27,7 +27,7 @@
 
 This package is all you need if you don't want graphical components (like grids and charts)."/>
     <License Value="LGPL with static linking exception. This is the same license as is used in the LCL (Lazarus Component Library)."/>
-    <Version Major="1" Minor="5"/>
+    <Version Major="1" Minor="6"/>
     <Files Count="35">
       <Item1>
         <Filename Value="fpolestorage.pas"/>
diff --git a/components/fpspreadsheet/laz_fpspreadsheet_visual.lpk b/components/fpspreadsheet/laz_fpspreadsheet_visual.lpk
index 1dfb385d7..a76fa5254 100644
--- a/components/fpspreadsheet/laz_fpspreadsheet_visual.lpk
+++ b/components/fpspreadsheet/laz_fpspreadsheet_visual.lpk
@@ -19,7 +19,7 @@
 
 It provides graphical components like a grid and chart."/>
     <License Value="LGPL with static linking exception. This is the same license as is used in the LCL (Lazarus Component Library)."/>
-    <Version Major="1" Minor="5"/>
+    <Version Major="1" Minor="6"/>
     <Files Count="5">
       <Item1>
         <Filename Value="fpspreadsheetctrls.pas"/>
diff --git a/components/fpspreadsheet/laz_fpspreadsheetexport_visual.lpk b/components/fpspreadsheet/laz_fpspreadsheetexport_visual.lpk
index 20f0c8620..cd999cd41 100644
--- a/components/fpspreadsheet/laz_fpspreadsheetexport_visual.lpk
+++ b/components/fpspreadsheet/laz_fpspreadsheetexport_visual.lpk
@@ -24,7 +24,7 @@
 
 It provides a graphical export component on the Data Export tab."/>
     <License Value="LGPL with static linking exception. This is the same license as is used in the LCL (Lazarus Component Library)."/>
-    <Version Major="1" Minor="5"/>
+    <Version Major="1" Minor="6"/>
     <Files Count="2">
       <Item1>
         <Filename Value="fpsexport.pas"/>