diff --git a/doc/ChangeLog b/doc/ChangeLog
index 175ac806b..f6a60afc6 100644
--- a/doc/ChangeLog
+++ b/doc/ChangeLog
@@ -1,3 +1,8 @@
+2010-01-15  Carsten Dominik  <carsten.dominik@gmail.com>
+
+	* org.texi (Clean view): Mention that `wrap-prefix' is also set by
+	org-indent-mode.
+
 2010-01-14  Carsten Dominik  <carsten.dominik@gmail.com>
 
 	* org.texi (Agenda commands): Add information about prefix args to
diff --git a/doc/org.texi b/doc/org.texi
index 4e74124ea..0275c84f7 100644
--- a/doc/org.texi
+++ b/doc/org.texi
@@ -10908,16 +10908,19 @@ more text                        |          more text
 If you are using at least Emacs 23.1.50.3 and version 6.29 of Org, this kind
 of view can be achieved dynamically at display time using
 @code{org-indent-mode}.  In this minor mode, all lines are prefixed for
-display with the necessary amount of space.  Also headlines are prefixed with
-additional stars, so that the amount of indentation shifts by
-two@footnote{See the variable @code{org-indent-indentation-per-level}.}
-spaces per level.  All headline stars but the last one are made invisible
-using the @code{org-hide} face@footnote{Turning on @code{org-indent-mode}
-sets @code{org-hide-leading-stars} to @code{t} and
-@code{org-adapt-indentation} to @code{nil}.} - see below under @samp{2.} for
-more information on how this works.  You can turn on @code{org-indent-mode}
-for all files by customizing the variable @code{org-startup-indented}, or you
-can turn it on for individual files using
+display with the necessary amount of space@footnote{@code{org-indent-mode}
+also sets the @code{wrap-prefix} property, such that @code{visual-line-mode}
+(or purely setting @code{word-wrap}) wraps long lines (including headlines)
+correctly indented.  }.  Also headlines are prefixed with additional stars,
+so that the amount of indentation shifts by two@footnote{See the variable
+@code{org-indent-indentation-per-level}.}  spaces per level.  All headline
+stars but the last one are made invisible using the @code{org-hide}
+face@footnote{Turning on @code{org-indent-mode} sets
+@code{org-hide-leading-stars} to @code{t} and @code{org-adapt-indentation} to
+@code{nil}.} - see below under @samp{2.} for more information on how this
+works.  You can turn on @code{org-indent-mode} for all files by customizing
+the variable @code{org-startup-indented}, or you can turn it on for
+individual files using
 
 @example
 #+STARTUP: indent