diff --git a/doc/drupal.txt b/doc/drupal.txt
index 7c66c18..094389e 100644
--- a/doc/drupal.txt
+++ b/doc/drupal.txt
@@ -64,7 +64,14 @@ whitespace and PHP comment lines longer than 80 characters.
 The file ftplugin/php_drupal.vim sets the following options when editing PHP
 files:
 	'ignorecase', 'smartcase', 'smartindent', 'smarttab', 'expandtab',
-	'tabstop'=2, 'shiftwidth'=2, 'autoindent'
+	'tabstop'=2, 'shiftwidth'=2, 'autoindent', 'comments', 'textwidth',
+	'formatoptions'
+Comments (both doc blocks and //-style) will automatically break at 80
+characters, and can be reformatted with |gq|.  You can start a doc block with
+"/**<CR>" and the indentation and comment leader will be inserted.  To end the
+block, just type "<CR>/" and the inserted "* " will automatically turn into
+"*/".  To delete the automatically inserted "// ", you can use <C-U>.
+
 It also defines the following mappings:
 
 gl	Custom SVN blame		*drupal-SVN-blame* *drupal-gl*
diff --git a/ftplugin/php_drupal.vim b/ftplugin/php_drupal.vim
index 7d1755e..93f8e6b 100644
--- a/ftplugin/php_drupal.vim
+++ b/ftplugin/php_drupal.vim
@@ -10,6 +10,18 @@ setl expandtab               "Tab key inserts spaces
 setl tabstop=2               "Use two spaces for tabs
 setl shiftwidth=2            "Use two spaces for auto-indent
 setl autoindent              "Auto indent based on previous line
+setl textwidth=80            "Limit comment lines to 80 characters.
+setl formatoptions-=t
+setl formatoptions+=croql
+"  -t:  Do not apply 'textwidth' to code.
+"  +c:  Apply 'textwidth' to comments.
+"  +r:  Continue comments after hitting <Enter> in Insert mode.
+"  +o:  Continue comments after when using 'O' or 'o' to open a new line.
+"  +q:  Format comments using q<motion>.
+"  +l:  Do not break a comment line if it is long before you start.
+setl comments=sr:/**,m:*\ ,ex:*/,://
+"  Format comment blocks.  Just type / on a new line to close.
+"  Recognize // (but not #) style comments.
 
 " Custom SVN blame
 vmap <buffer> gl :<C-U>!svn blame <C-R>=expand("%:P") <CR> \| sed -n <C-R>=line("'<") <CR>,<C-R>=line("'>") <CR>p <CR>