diff --git a/docs/less.html b/docs/less.html
index 476f5ac982..aff16044f9 100644
--- a/docs/less.html
+++ b/docs/less.html
@@ -907,6 +907,11 @@
         <td><code>@columnCount, @columnGap: @gridGutterWidth</code></td>
         <td>Make the content of any element use CSS3 columns</td>
       </tr>
+      <tr>
+        <td><code>.hyphens()</code></td>
+        <td><code>@mode: auto</code></td>
+        <td>CSS3 hyphenation when you want it (includes <code>word-wrap: break-word</code>)</td>
+      </tr>
     </tbody>
   </table>
   <h3>Backgrounds and gradients</h3>
diff --git a/docs/templates/pages/less.mustache b/docs/templates/pages/less.mustache
index bb71484534..a83a28ceda 100644
--- a/docs/templates/pages/less.mustache
+++ b/docs/templates/pages/less.mustache
@@ -830,6 +830,11 @@
         <td><code>@columnCount, @columnGap: @gridGutterWidth</code></td>
         <td>{{_i}}Make the content of any element use CSS3 columns{{/i}}</td>
       </tr>
+      <tr>
+        <td><code>.hyphens()</code></td>
+        <td><code>@mode: auto</code></td>
+        <td>{{_i}}CSS3 hyphenation when you want it (includes <code>word-wrap: break-word</code>){{/i}}</td>
+      </tr>
     </tbody>
   </table>
   <h3>{{_i}}Backgrounds and gradients{{/i}}</h3>
diff --git a/less/mixins.less b/less/mixins.less
index b5c5352cf2..8efe12b388 100644
--- a/less/mixins.less
+++ b/less/mixins.less
@@ -314,12 +314,12 @@
 
 // Optional hyphenation
 .hyphens(@mode: auto) {
+  word-wrap: break-word;
   -webkit-hyphens: @mode;
      -moz-hyphens: @mode;
       -ms-hyphens: @mode;
        -o-hyphens: @mode;
           hyphens: @mode;
-        word-wrap: break-word;
 }
 
 // Opacity