diff --git a/ChangeLog b/ChangeLog
index a0b38cefa..d29574b35 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2005-02-07  Denis Poitrenaud  <Denis.Poitrenaud@lip6.fr>
+
+	* src/misc/optionmap.cc, src/misc/optionmap.hh: Typo (Hummm).
+
 2005-02-07  Denis Poitrenaud  <Denis.Poitrenaud@lip6.fr>
 
 	* src/misc/optionmap.cc, src/misc/optionmap.hh (option_map): New class.
diff --git a/src/misc/optionmap.cc b/src/misc/optionmap.cc
index 78cb7ff81..caa366b22 100644
--- a/src/misc/optionmap.cc
+++ b/src/misc/optionmap.cc
@@ -26,7 +26,8 @@
 
 namespace spot
 {
-  namespace {
+  namespace
+  {
     bool
     to_int(const char* s, int &i)
     {
@@ -45,7 +46,7 @@ namespace spot
 
   const char* option_map::parse_options(char* options)
   {
-      char* opt = strtok(options, "\t, ;");
+      char* opt = strtok(options, ", \t;");
       while (opt)
         {
           char* equal;
@@ -60,7 +61,7 @@ namespace spot
           else
             // default value if declared
             options_[opt] = 1;
-          opt = strtok(0, "\t, ;");
+          opt = strtok(0, ", \t;");
         }
       return 0;
   }
diff --git a/src/misc/optionmap.hh b/src/misc/optionmap.hh
index ef27573a3..610ddf864 100644
--- a/src/misc/optionmap.hh
+++ b/src/misc/optionmap.hh
@@ -19,8 +19,8 @@
 // Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
 // 02111-1307, USA.
 
-#ifndef SPOT_MISC_OPTION_MAP_HH
-# define SPOT_MISC_OPTION_MAP_HH
+#ifndef SPOT_MISC_OPTIONMAP_HH
+# define SPOT_MISC_OPTIONMAP_HH
 
 #include <string>
 #include <map>
@@ -71,4 +71,4 @@ namespace spot
   };
 };
 
-#endif
+#endif // SPOT_MISC_OPTIONMAP_HH