diff --git a/Jamfile b/Jamfile
index e25cb810c..c6493db70 100755
--- a/Jamfile
+++ b/Jamfile
@@ -221,7 +221,7 @@ feature.compose <openssl>off : <define>TORRENT_DISABLE_ENCRYPTION ;
 feature resolve-countries : on off : composite propagated link-incompatible ;
 feature.compose <resolve-countries>off : <define>TORRENT_DISABLE_RESOLVE_COUNTRIES ;
 
-feature character-set : ansi unicode : composite propagated link-incompatible ;
+feature character-set : unicode ansi : composite propagated link-incompatible ;
 feature.compose <character-set>unicode : <define>_UNICODE <define>UNICODE ;
 
 feature zlib : shipped system : composite propagated link-incompatible ;
diff --git a/docs/building.html b/docs/building.html
index 3b44f38d6..19cc07b79 100644
--- a/docs/building.html
+++ b/docs/building.html
@@ -345,10 +345,10 @@ information.</li>
 <td><p class="first">This setting will only have an affect on windows.
 Other platforms are expected to support UTF-8.</p>
 <ul class="last simple">
+<li><tt class="docutils literal"><span class="pre">unicode</span></tt> - The unicode version of the win32
+API is used. This is default.</li>
 <li><tt class="docutils literal"><span class="pre">ansi</span></tt> - The ansi version of the win32 API is
 used.</li>
-<li><tt class="docutils literal"><span class="pre">unicode</span></tt> - The unicode version of the win32
-API is used.</li>
 </ul>
 </td>
 </tr>
diff --git a/docs/building.rst b/docs/building.rst
index 2a6149fb4..c889a6328 100644
--- a/docs/building.rst
+++ b/docs/building.rst
@@ -303,10 +303,10 @@ Build features:
 | ``character-set``      | This setting will only have an affect on windows.  |
 |                        | Other platforms are expected to support UTF-8.     |
 |                        |                                                    |
+|                        | * ``unicode`` - The unicode version of the win32   |
+|                        |   API is used. This is default.                    |
 |                        | * ``ansi`` - The ansi version of the win32 API is  |
 |                        |   used.                                            |
-|                        | * ``unicode`` - The unicode version of the win32   |
-|                        |   API is used.                                     |
 +------------------------+----------------------------------------------------+
 | ``invariant-checks``   | This setting only affects debug builds (where      |
 |                        | ``NDEBUG`` is not defined). It defaults to ``on``. |