diff --git a/ChangeLog b/ChangeLog
index fceeddaf57314b9200deb89da7862c341fceba50..08619413a7813f1c54f0db18614007e2d0e7cb5c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2010-04-07 Chris Allegretta <chrisa@asty.org>
+	* doc/man/nano.1,nanorc.5: Add warnings about using backup
+	  mode as root due to the Dan Rosenberg security analysis.
+ 
 2010-04-02 Chris Allegretta <chrisa@asty.org>
 	* files.c (do_writeout): Expand modification check to include both the
 	  original file's device ID and inode number as reasons to warn the 
diff --git a/doc/man/nano.1 b/doc/man/nano.1
index a1ef3270566239201bf14863c0712139b5c896b2..05ba462ffdf66ab1bf3dfeaae7873df4eb64cb49 100644
--- a/doc/man/nano.1
+++ b/doc/man/nano.1
@@ -62,7 +62,8 @@ line.
 .TP
 .B \-B (\-\-backup)
 When saving a file, back up the previous version of it to the current
-filename suffixed with a ~.
+filename suffixed with a ~.  This option is not recommended when editing
+files as root due to potential security implications.
 .TP
 .B \-C \fIdir\fP (\-\-backupdir=\fIdir\fP)
 Set the directory where \fBnano\fP puts unique backup files if file
diff --git a/doc/man/nanorc.5 b/doc/man/nanorc.5
index c172e61e8de98df2e54267685862a4d93d17350e..04ab1d3fed7217ef290f20c7622c67af8ce3a090 100644
--- a/doc/man/nanorc.5
+++ b/doc/man/nanorc.5
@@ -451,7 +451,8 @@ When writing a file, append to the end instead of overwriting.
 When writing a file, 'prepend' (write at the beginning) instead of overwriting.
 .TP
 .B backup
-When writing a file, create a backup of the current file.
+When writing a file, create a backup of the current file.  This option is not 
+recommended when editing files as root due to potential security implications.
 .TP
 .B firstfile
 Move to the first file when using the file browser (reading or writing files).