diff --git a/ChangeLog b/ChangeLog
index 0bc8eabdc..7a5b204e4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,9 @@
 
  * src/plugins.c:
    Improve the opening string in the plugin manager dialog.
+ * doc/geany.css:
+   Use "max-width" to set the document width of the generated
+   HTML documentation to let the text be auto-wrapped.
 
 
 2009-09-04  Nick Treleaven  <nick(dot)treleaven(at)btinternet(dot)com>
diff --git a/doc/geany.css b/doc/geany.css
index 29f902d90..10c5621b2 100644
--- a/doc/geany.css
+++ b/doc/geany.css
@@ -12,7 +12,7 @@ Stylesheet for Geany's documentation based on a version of John Gabriele.
 		background-color: #f2f2f2;
 		color: #404040;
 		margin-left: 0.4em;
-		width: 60em;
+		max-width: 60em;
 		font-size: 90%;
 	}