Index: tools/smaz.adb
==================================================================
--- tools/smaz.adb
+++ tools/smaz.adb
@@ -73,10 +73,11 @@
          Job_Count,
          Help,
          Sx_Dict_Output,
          Min_Sub_Size,
          Max_Sub_Size,
+         Dict_Size,
          Max_Pending,
          Stat_Output,
          No_Stat_Output,
          Text_List_Input,
          Fast_Text_Input,
@@ -95,10 +96,11 @@
       Sx_Output : Boolean := False;
       Sx_Dict_Output : Boolean := False;
       Min_Sub_Size : Positive := 1;
       Max_Sub_Size : Positive := 3;
       Max_Word_Size : Positive := 10;
+      Dict_Size : Positive := 254;
       Max_Pending : Ada.Containers.Count_Type
         := Ada.Containers.Count_Type'Last;
       Job_Count : Natural := 0;
       Filter_Threshold : Natools.Smaz.Tools.String_Count := 0;
       Score_Method : Methods.Enum := Methods.Encoded;
@@ -315,10 +317,13 @@
          when Options.Score_Method =>
             Handler.Score_Method := Methods.Enum'Value (Argument);
 
          when Options.Max_Pending =>
             Handler.Max_Pending := Ada.Containers.Count_Type'Value (Argument);
+
+         when Options.Dict_Size =>
+            Handler.Dict_Size := Positive'Value (Argument);
       end case;
    end Option;
 
 
    procedure Evaluate_Dictionary
@@ -372,10 +377,11 @@
       R.Add_Option ("hash-pkg",      'H', Required_Argument, Output_Hash);
       R.Add_Option ("jobs",          'j', Required_Argument, Job_Count);
       R.Add_Option ("sx-dict",       'L', No_Argument,       Sx_Dict_Output);
       R.Add_Option ("min-substring", 'm', Required_Argument, Min_Sub_Size);
       R.Add_Option ("max-substring", 'M', Required_Argument, Max_Sub_Size);
+      R.Add_Option ("dict-size",     'n', Required_Argument, Dict_Size);
       R.Add_Option ("max-pending",   'N', Required_Argument, Max_Pending);
       R.Add_Option ("stats",         's', No_Argument,       Stat_Output);
       R.Add_Option ("no-stats",      'S', No_Argument,       No_Stat_Output);
       R.Add_Option ("text-list",     't', No_Argument,       Text_List_Input);
       R.Add_Option ("fast-text-list", 'T', No_Argument,       Fast_Text_Input);
@@ -751,10 +757,15 @@
             when Options.Max_Pending =>
                Put_Line (Output, " <count>");
                Put_Line (Output, Indent & Indent
                  & "Maximum size of candidate list"
                  & " when building a dictionary");
+
+            when Options.Dict_Size =>
+               Put_Line (Output, " <count>");
+               Put_Line (Output, Indent & Indent
+                 & "Number of words in the dictionary to build");
          end case;
       end loop;
    end Print_Help;
 
 
@@ -793,11 +804,15 @@
                if Handler.Dict_Source = Dict_Sources.Text_List then
                   declare
                      Selected, Pending : Natools.Smaz.Tools.String_Lists.List;
                   begin
                      Natools.Smaz.Tools.Simple_Dictionary_And_Pending
-                       (Counter, 254, Selected, Pending, Handler.Max_Pending);
+                       (Counter,
+                        Handler.Dict_Size,
+                        Selected,
+                        Pending,
+                        Handler.Max_Pending);
 
                      return Optimize_Dictionary
                        (Natools.Smaz.Tools.To_Dictionary (Selected, True),
                         Pending,
                         Input,