diff --git a/doc/setup.texi b/doc/setup.texi
index a868ac41b..ae6b1ca03 100644
--- a/doc/setup.texi
+++ b/doc/setup.texi
@@ -123,6 +123,13 @@ Master key:
 Verifying password - Master key: 
 @end example
 
+If you want to generate a random master key you can use the
+--random-key to kstash. This will make sure you have a good key
+attackers can't do a dictionary attack on the master key.
+
+If you have a master key, make sure you make a backup of your master
+key file, without it, backups of the database is of no use.
+
 To initialise the database use the @code{kadmin} program, with the
 @samp{-l} option (to enable local database mode). First issue a
 @kbd{init MY.REALM} command. This will create the database and insert