diff --git a/doc/org.texi b/doc/org.texi
index 4ca058820..660cc2f4e 100644
--- a/doc/org.texi
+++ b/doc/org.texi
@@ -1851,7 +1851,8 @@ Sometimes you want to keep information associated with an entry, but you
 normally don't want to see it.  For this, Org mode has @emph{drawers}.
 Drawers need to be configured with the option @code{org-drawers}@footnote{You
 can define additional drawers on a per-file basis with a line like
-@code{#+DRAWERS: HIDDEN STATE}}.  Drawers look like this:
+@code{#+DRAWERS: HIDDEN STATE}}.  They can contain anything but a headline
+and another drawer.  Drawers look like this:
 
 @example
 ** This is a headline
@@ -1876,7 +1877,8 @@ press @key{TAB} there.  Org mode uses the @code{PROPERTIES} drawer for
 storing properties (@pxref{Properties and Columns}), and you can also arrange
 for state change notes (@pxref{Tracking TODO state changes}) and clock times
 (@pxref{Clocking work time}) to be stored in a drawer @code{LOGBOOK}.  If you
-want to store a quick note in the LOGBOOK drawer, in a similar way to state changes, use
+want to store a quick note in the LOGBOOK drawer, in a similar way to state
+changes, use
 
 @table @kbd
 @kindex C-c C-z
@@ -1885,10 +1887,11 @@ Add a time-stamped note to the LOGBOOK drawer.
 @end table
 
 @vindex org-export-with-drawers
+@vindex org-export-with-properties
 You can select the name of the drawers which should be exported with
 @code{org-export-with-drawers}.  In that case, drawer contents will appear in
-export output.  Property drawers are not affected by this variable and are
-never exported.
+export output.  Property drawers are not affected by this variable: configure
+@code{org-export-with-properties} instead.
 
 @node Blocks, Footnotes, Drawers, Document Structure
 @section Blocks