diff --git a/config/freetype.mk b/config/freetype.mk
index af7933889..72d96be95 100644
--- a/config/freetype.mk
+++ b/config/freetype.mk
@@ -53,8 +53,8 @@ BASE_     := $(BASE_DIR)$(SEP)
 OBJ_      := $(OBJ_DIR)$(SEP)
 LIB_      := $(LIB_DIR)$(SEP)
 PUBLIC_   := $(TOP)$(SEP)include$(SEP)freetype$(SEP)
-INTERNAL_ := $(PUBLIC_)$(SEP)internal$(SEP)
-CONFIG_   := $(PUBLIC_)$(SEP)config$(SEP)
+INTERNAL_ := $(PUBLIC_)internal$(SEP)
+CONFIG_   := $(PUBLIC_)config$(SEP)
 
 
 # The name of the final library file.
diff --git a/config/modules.mk b/config/modules.mk
index 876b33e0b..f6743572d 100644
--- a/config/modules.mk
+++ b/config/modules.mk
@@ -25,7 +25,7 @@
 # resides.  For now, it is in `config/ftmodule.h'.
 #
 ifndef FT_MODULE_LIST
-  FT_MODULE_LIST := $(CONFIG_)ftmodule.h
+  FT_MODULE_LIST := $(TOP)$(SEP)include$(SEP)freetype$(SEP)config$(SEP)ftmodule.h
 endif
 
 # To build the modules list, we invoke the `make_module_list' target.
diff --git a/docs/tutorial/index.html b/docs/tutorial/index.html
index 0ada333a1..8158e5069 100644
--- a/docs/tutorial/index.html
+++ b/docs/tutorial/index.html
@@ -25,6 +25,9 @@ FreeType 2.0 Tutorial</h1></center>
 (<a href="http://www.freetype.org">www.freetype.org</a>)
 </h3></center>
 
+<center>
+<table width=650><tr><td>
+
 <p><br>
 <hr WIDTH="100%">
 <br>&nbsp;
@@ -38,17 +41,13 @@ FreeType 2.0 Tutorial</h1></center>
 
 <h3>1. Header files :</h3>
 <ul>
-  You only need to include the public header file named <tt>freetype.h</tt>
-  in your source code. Depending on how the library was installed on your
-  system, you might need to use :<p>
+  To include the main FreeType header file, simply use:<p>
   <ul><font color="blue"><tt>
-      #include &lt;freetype.h&gt;<p>
+      #include &lt;freetype/freetype.h&gt;<p>
   </tt></font></ul>
-  or
-  <ul><font color="blue"><tt>
-      #include &lt;freetype2/freetype.h&gt;<p>
-  </tt></font></ul>
-  in your application to include the public interface to FreeType.<p>
+  in your application code. Note that other files are available in the
+  FreeType include directory, most of them being included by
+  <tt>"freetype.h"</tt>. They will be described later in this tutorial.
 </ul>
 
 <p><hr><p>
@@ -59,7 +58,7 @@ FreeType 2.0 Tutorial</h1></center>
   <tt>library</tt>, and call the function <tt>FT_Init_FreeType</tt> as in:
   
   <font color="blue"><pre>
-       #include &lt;freetype.h&gt;
+       #include &lt;freetype/freetype.h&gt;
        
        FT_Library  library;
        
@@ -103,26 +102,26 @@ FreeType 2.0 Tutorial</h1></center>
     <p>
     <font color="blue"><pre>
     
-          FT_Library   library;   /* handle to library     */
-          FT_Face      face;      /* handle to face object */
-    
-          error = FT_Init_FreeType( &library );
-          if (error) { ..... }
-          
-          error = FT_New_Face( library,
-                               "/usr/share/fonts/truetype/arial.ttf",
-                               0,
-                               &face );
-          if (error == FT_Err_Unknown_File_Format)
-          {
-             .... the font file could be opened and read, but it appears
-             .... that its font format is unsupported
-          }
-          else if (error)
-          {
-             .... another error code means that the font file could not
-             .... be opened, read or simply that it is broken..
-          }
+      FT_Library   library;   /* handle to library     */
+      FT_Face      face;      /* handle to face object */
+
+      error = FT_Init_FreeType( &library );
+      if (error) { ..... }
+      
+      error = FT_New_Face( library,
+                           "/usr/share/fonts/truetype/arial.ttf",
+                           0,
+                           &face );
+      if (error == FT_Err_Unknown_File_Format)
+      {
+         .... the font file could be opened and read, but it appears
+         .... that its font format is unsupported
+      }
+      else if (error)
+      {
+         .... another error code means that the font file could not
+         .... be opened, read or simply that it is broken..
+      }
     </pre></font>
     <p>
     As you certainly imagine, <tt>FT_New_Face</tt> opens a font file then
@@ -639,6 +638,8 @@ FreeType 2.0 Tutorial</h1></center>
   <p>
   </ul>
 </ul>
-  
+
+</td></tr></table>
+</center>  
 <p><hr>