diff --git a/doc/org/autfilt.org b/doc/org/autfilt.org
index 65e445dfb..316ce6eed 100644
--- a/doc/org/autfilt.org
+++ b/doc/org/autfilt.org
@@ -1,5 +1,6 @@
 # -*- coding: utf-8 -*-
 #+TITLE: =autfilt=
+#+DESCRIPTION: Spot command-line tool for filtering, tranforming, and converting ω-automata.
 #+SETUPFILE: setup.org
 #+HTML_LINK_UP: tools.html
 
diff --git a/doc/org/compile.org b/doc/org/compile.org
index f9627b7bb..5aa47111a 100644
--- a/doc/org/compile.org
+++ b/doc/org/compile.org
@@ -1,5 +1,6 @@
 # -*- coding: utf-8 -*-
 #+TITLE: Compiling against Spot
+#+DESCRIPTION: How to compile C++11 programs using Spot
 #+SETUPFILE: setup.org
 #+HTML_LINK_UP: tut.html
 
diff --git a/doc/org/concepts.org b/doc/org/concepts.org
index 847975308..ea86e9e18 100644
--- a/doc/org/concepts.org
+++ b/doc/org/concepts.org
@@ -1,5 +1,6 @@
 # -*- coding: utf-8 -*-
 #+TITLE: Concepts
+#+DESCRIPTION: Informal explanation of various concepts used in Spot.
 #+SETUPFILE: setup.org
 #+HTML_LINK_UP: index.html
 
diff --git a/doc/org/csv.org b/doc/org/csv.org
index 6ae9cc65b..4a4d6e37d 100644
--- a/doc/org/csv.org
+++ b/doc/org/csv.org
@@ -1,5 +1,6 @@
 # -*- coding: utf-8 -*-
 #+TITLE: Reading and writing CSV files
+#+DESCRIPTION: Examples showing how to read and write CSV files using Spot's command-line tools.
 #+SETUPFILE: setup.org
 #+HTML_LINK_UP: tools.html
 
diff --git a/doc/org/dstar2tgba.org b/doc/org/dstar2tgba.org
index 70122ed3e..7a64539e8 100644
--- a/doc/org/dstar2tgba.org
+++ b/doc/org/dstar2tgba.org
@@ -1,5 +1,6 @@
 # -*- coding: utf-8 -*-
 #+TITLE: =dstar2tgba=
+#+DESCRIPTION: Spot command-line tool for converting automata into Transition-based Generalized Büchi Automata.
 #+SETUPFILE: setup.org
 #+HTML_LINK_UP: tools.html
 
diff --git a/doc/org/genltl.org b/doc/org/genltl.org
index 60f849942..11df83117 100644
--- a/doc/org/genltl.org
+++ b/doc/org/genltl.org
@@ -1,5 +1,6 @@
 # -*- coding: utf-8 -*-
 #+TITLE: =genltl=
+#+DESCRIPTION: Spot command-line tool that generates LTL formulas from known patterns
 #+SETUPFILE: setup.org
 #+HTML_LINK_UP: tools.html
 
diff --git a/doc/org/hoa.org b/doc/org/hoa.org
index 64dae991e..4fae27970 100644
--- a/doc/org/hoa.org
+++ b/doc/org/hoa.org
@@ -1,4 +1,5 @@
 #+TITLE: Support for the Hanoi Omega Automata (HOA) Format
+#+DESCRIPTION: Details about support of the HOA format in Spot
 #+SETUPFILE: setup.org
 #+HTML_LINK_UP: tools.html
 
diff --git a/doc/org/index.org b/doc/org/index.org
index d79945db9..bffc627ae 100644
--- a/doc/org/index.org
+++ b/doc/org/index.org
@@ -1,9 +1,11 @@
 # -*- coding: utf-8 -*-
-#+TITLE: Spot
+#+TITLE: Spot: a platform for LTL and ω-automata manipulation
+#+DESCRIPTION: Spot is a library and tool suite for LTL and ω-automata
+#+KEYWORDS: Spot,C++11,library,platform,framework,tool-suite,LTL,PSL,omega-automata
 #+SETUPFILE: setup.org
 #+HTML_HEAD_EXTRA: <style>#org-div-home-and-up { display: none; }</style>
 
-Spot is a C++11 library for ω-automata manipulation and model
+Spot is a C++11 library for LTL, ω-automata manipulation and model
 checking.  It has the following notable features:
 
 - Support for [[file:concepts.org::#ltl][LTL]] (several syntaxes supported) and
@@ -22,11 +24,11 @@ checking.  It has the following notable features:
   weak-DBA, removal of useless SCCs, acceptance-condition
   transformations, determinization, etc.
 - In addition to the C++ interface, most of its algorithms are usable
-  via [[file:tools.org][command-line tools]], and via Python bindings.
-- One command-line tool, called [[file:ltlcross.org][=ltlcross=]], is a rewrite of
-  [[http://www.tcs.hut.fi/Software/lbtt/][LBTT]], but with support for PSL and arbitrary acceptance conditions.
-  It could for instance be used to test tools that translate LTL into
-  Rabin automata.
+  via [[file:tools.org][command-line tools]], and via [[file:tut.org][Python bindings]].
+- One command-line tool, called [[file:ltlcross.org][=ltlcross=]], is a rewrite of [[http://www.tcs.hut.fi/Software/lbtt/][LBTT]], but
+  with support for PSL and automata with arbitrary acceptance
+  conditions.  It can be used to test tools that translate LTL into
+  ω-automata, or benchmark them.
 
 * Latest version
 
diff --git a/doc/org/install.org b/doc/org/install.org
index f96a7410d..c60d5c64d 100644
--- a/doc/org/install.org
+++ b/doc/org/install.org
@@ -1,5 +1,6 @@
 # -*- coding: utf-8 -*-
 #+TITLE: Installing Spot
+#+DESCRIPTION: Different ways to install the Spot package
 #+SETUPFILE: setup.org
 #+HTML_LINK_UP: index.html
 
diff --git a/doc/org/ioltl.org b/doc/org/ioltl.org
index 3873aaf16..be7d10695 100644
--- a/doc/org/ioltl.org
+++ b/doc/org/ioltl.org
@@ -1,5 +1,6 @@
 # -*- coding: utf-8 -*-
 #+TITLE: Common input and output options for LTL/PSL formulas
+#+DESCRIPTION: Options for input and output of temporal logic formulas in Spot's command-line tools
 #+SETUPFILE: setup.org
 #+HTML_LINK_UP: tools.html
 
diff --git a/doc/org/ltl2tgba.org b/doc/org/ltl2tgba.org
index b75a7ddaf..d85e2cead 100644
--- a/doc/org/ltl2tgba.org
+++ b/doc/org/ltl2tgba.org
@@ -1,5 +1,6 @@
 # -*- coding: utf-8 -*-
 #+TITLE: =ltl2tgba=
+#+DESCRIPTION: Spot command-line tool for translating LTL into Transition-based Generalized Büchi Automata.
 #+SETUPFILE: setup.org
 #+HTML_LINK_UP: tools.html
 
diff --git a/doc/org/ltl2tgta.org b/doc/org/ltl2tgta.org
index ff290d87f..a7e3d6fdb 100644
--- a/doc/org/ltl2tgta.org
+++ b/doc/org/ltl2tgta.org
@@ -1,5 +1,6 @@
 # -*- coding: utf-8 -*-
 #+TITLE: =ltl2tgta=
+#+DESCRIPTION: Spot command-line tool for translating LTL into Transition-based Generalized Testing Automata.
 #+SETUPFILE: setup.org
 #+HTML_LINK_UP: tools.html
 
diff --git a/doc/org/ltlcross.org b/doc/org/ltlcross.org
index eaada3ded..db69fea88 100644
--- a/doc/org/ltlcross.org
+++ b/doc/org/ltlcross.org
@@ -1,5 +1,6 @@
 # -*- coding: utf-8 -*-
 #+TITLE: =ltlcross=
+#+DESCRIPTION: Spot command-line tool for cross-comparing the output of LTL translators.
 #+SETUPFILE: setup.org
 #+HTML_LINK_UP: tools.html
 
diff --git a/doc/org/ltldo.org b/doc/org/ltldo.org
index 1b5d4b481..37bd1efa3 100644
--- a/doc/org/ltldo.org
+++ b/doc/org/ltldo.org
@@ -1,5 +1,6 @@
 # -*- coding: utf-8 -*-
 #+TITLE: =ltldo=
+#+DESCRIPTION: Spot's wrapper for third-party LTL translators
 #+SETUPFILE: setup.org
 #+HTML_LINK_UP: tools.html
 
diff --git a/doc/org/ltlfilt.org b/doc/org/ltlfilt.org
index 7f48010f7..cf5bca47d 100644
--- a/doc/org/ltlfilt.org
+++ b/doc/org/ltlfilt.org
@@ -1,5 +1,6 @@
 # -*- coding: utf-8 -*-
 #+TITLE: =ltlfilt=
+#+DESCRIPTION: Spot command-line tool for filtering, tranforming, and converting LTL formulas.
 #+SETUPFILE: setup.org
 #+HTML_LINK_UP: tools.html
 
diff --git a/doc/org/ltlgrind.org b/doc/org/ltlgrind.org
index d1729f737..6c33b8d9a 100644
--- a/doc/org/ltlgrind.org
+++ b/doc/org/ltlgrind.org
@@ -1,5 +1,6 @@
 # -*- coding: utf-8 -*-
 #+TITLE: =ltlgrind=
+#+DESCRIPTION: Spot command-line tool for mutating LTL formulas.
 #+SETUPFILE: setup.org
 #+HTML_LINK_UP: tools.html
 
diff --git a/doc/org/oaut.org b/doc/org/oaut.org
index b9cf5e85c..9572ae377 100644
--- a/doc/org/oaut.org
+++ b/doc/org/oaut.org
@@ -1,5 +1,6 @@
 # -*- coding: utf-8 -*-
 #+TITLE: Common output options for automata
+#+DESCRIPTION: Options for input and output of ω-automata in Spot's command-line tools
 #+SETUPFILE: setup.org
 #+HTML_LINK_UP: tools.html
 
diff --git a/doc/org/randaut.org b/doc/org/randaut.org
index f51f63a04..2ef48d1dc 100644
--- a/doc/org/randaut.org
+++ b/doc/org/randaut.org
@@ -1,5 +1,6 @@
 # -*- coding: utf-8 -*-
 #+TITLE: =randaut=
+#+DESCRIPTION: Spot command-line tool for generating random ω-automata.
 #+SETUPFILE: setup.org
 #+HTML_LINK_UP: tools.html
 
diff --git a/doc/org/randltl.org b/doc/org/randltl.org
index 839dc066b..110601d6a 100644
--- a/doc/org/randltl.org
+++ b/doc/org/randltl.org
@@ -1,5 +1,6 @@
 # -*- coding: utf-8 -*-
 #+TITLE: =randltl=
+#+DESCRIPTION: Spot command-line tool for generating random LTL formulas.
 #+SETUPFILE: setup.org
 #+HTML_LINK_UP: tools.html
 
diff --git a/doc/org/satmin.org b/doc/org/satmin.org
index 92586c76f..bdd0240c2 100644
--- a/doc/org/satmin.org
+++ b/doc/org/satmin.org
@@ -1,5 +1,6 @@
 # -*- coding: utf-8 -*-
 #+TITLE: SAT-based Minimization of Deterministic ω-Automata
+#+DESCRIPTION: Spot command-line tools for minimizing ω-automata
 #+SETUPFILE: setup.org
 #+HTML_LINK_UP: tools.html
 
diff --git a/doc/org/tools.org b/doc/org/tools.org
index acdcaa0e9..81acd065c 100644
--- a/doc/org/tools.org
+++ b/doc/org/tools.org
@@ -1,5 +1,6 @@
 # -*- coding: utf-8 -*-
 #+TITLE: Command-line tools installed by Spot {{{SPOTVERSION}}}
+#+DESCRIPTION: List of all the command-line tools installed by Spot {{{SPOTVERSION}}}
 #+SETUPFILE: setup.org
 #+HTML_LINK_UP: index.html
 
diff --git a/doc/org/tut.org b/doc/org/tut.org
index 457fc1f4e..609dc981e 100644
--- a/doc/org/tut.org
+++ b/doc/org/tut.org
@@ -1,5 +1,6 @@
 # -*- coding: utf-8 -*-
 #+TITLE: Code Examples
+#+DESCRIPTION: Directory of code examples for using Spot in C++11, Python, and shell.
 #+SETUPFILE: setup.org
 #+HTML_LINK_UP: index.html
 
diff --git a/doc/org/tut01.org b/doc/org/tut01.org
index 9fdfda015..d2641f62a 100644
--- a/doc/org/tut01.org
+++ b/doc/org/tut01.org
@@ -1,5 +1,6 @@
 # -*- coding: utf-8 -*-
 #+TITLE: Parsing and Printing LTL Formulas
+#+DESCRIPTION: Code example for parsing and printing formulas in Spot
 #+SETUPFILE: setup.org
 #+HTML_LINK_UP: tut.html
 
diff --git a/doc/org/tut02.org b/doc/org/tut02.org
index d9e307a51..c02510ae1 100644
--- a/doc/org/tut02.org
+++ b/doc/org/tut02.org
@@ -1,5 +1,6 @@
 # -*- coding: utf-8 -*-
 #+TITLE: Relabeling Formulas
+#+DESCRIPTION: Code example for relabeling formulas in Spot
 #+SETUPFILE: setup.org
 #+HTML_LINK_UP: tut.html
 
diff --git a/doc/org/tut03.org b/doc/org/tut03.org
index 7240243fb..68cebe292 100644
--- a/doc/org/tut03.org
+++ b/doc/org/tut03.org
@@ -1,5 +1,6 @@
 # -*- coding: utf-8 -*-
 #+TITLE: Constructing and transforming formulas
+#+DESCRIPTION: Code example for constructing and transforming formulas in Spot
 #+SETUPFILE: setup.org
 #+HTML_LINK_UP: tut.html
 
diff --git a/doc/org/tut10.org b/doc/org/tut10.org
index b25f55bff..7772d2794 100644
--- a/doc/org/tut10.org
+++ b/doc/org/tut10.org
@@ -1,5 +1,6 @@
 # -*- coding: utf-8 -*-
 #+TITLE: Translating an LTL formula into a never claim
+#+DESCRIPTION: Code example for translating formulas in Spot
 #+SETUPFILE: setup.org
 #+HTML_LINK_UP: tut.html
 
diff --git a/doc/org/tut20.org b/doc/org/tut20.org
index f138f5419..c0b6dcf8e 100644
--- a/doc/org/tut20.org
+++ b/doc/org/tut20.org
@@ -1,5 +1,6 @@
 # -*- coding: utf-8 -*-
 #+TITLE: Converting a never claim into HOA
+#+DESCRIPTION: Code example for parsing and printing ω-automata in Spot
 #+SETUPFILE: setup.org
 #+HTML_LINK_UP: tut.html
 
diff --git a/doc/org/tut21.org b/doc/org/tut21.org
index 2140063d1..a0b3ebedc 100644
--- a/doc/org/tut21.org
+++ b/doc/org/tut21.org
@@ -1,5 +1,6 @@
 # -*- coding: utf-8 -*-
 #+TITLE: Custom print of an automaton
+#+DESCRIPTION: Code example for iterating over ω-automata in Spot
 #+SETUPFILE: setup.org
 #+HTML_LINK_UP: tut.html
 
diff --git a/doc/org/tut22.org b/doc/org/tut22.org
index da6ca6d7f..35f68416b 100644
--- a/doc/org/tut22.org
+++ b/doc/org/tut22.org
@@ -1,5 +1,6 @@
 # -*- coding: utf-8 -*-
 #+TITLE: Creating an automaton by adding states and transitions
+#+DESCRIPTION: Code example for constructing ω-automata in Spot
 #+SETUPFILE: setup.org
 #+HTML_LINK_UP: tut.html
 
diff --git a/doc/org/tut30.org b/doc/org/tut30.org
index bd82228cb..118c7a6f4 100644
--- a/doc/org/tut30.org
+++ b/doc/org/tut30.org
@@ -1,5 +1,6 @@
 # -*- coding: utf-8 -*-
 #+TITLE: Converting Rabin (or Other) to Büchi, and simplifying it
+#+DESCRIPTION: Code example for converting ω-automata in Spot
 #+SETUPFILE: setup.org
 #+HTML_LINK_UP: tut.html
 
diff --git a/doc/org/upgrade2.org b/doc/org/upgrade2.org
index 9c4bdfbf2..e2618e4f5 100644
--- a/doc/org/upgrade2.org
+++ b/doc/org/upgrade2.org
@@ -1,5 +1,6 @@
 # -*- coding: utf-8 -*-
 #+TITLE: Upgrading from Spot 1.2.6
+#+DESCRIPTION: Help for upgrading code to Spot 2.0
 #+SETUPFILE: setup.org
 #+HTML_LINK_UP: index.html