diff --git a/README.md b/README.md
index 404dceb..2dc4ec3 100644
--- a/README.md
+++ b/README.md
@@ -51,7 +51,7 @@ The mutt-wizard is run with the command `mw`. It also installs the `mailsync` co
 ### Optional
 
 - `w3m` - view HTML email and images in neomutt.
-- `notmuch` - index and search mail. Install it and run `notmuch setup`, tell it that your mail is in `~/.local/share/mail/`. You can run it in mutt with `ctrl-f`. Run `notmuch new` to process new mail, although the included `mailsync` script does this for you.
+- `[notmuch](notmuch)` - index and search mail. Install it and run `notmuch setup`, tell it that your mail is in `~/.local/share/mail/` (although `mw` will do this automatically if you haven't set notmuch up before). You can run it in mutt with `ctrl-f`. Run `notmuch new` to process new mail, although the included `mailsync` script does this for you.
 - `libnotify`/`libnotify-bin` - allows notifications when syncthing mail with `mailsync`
 - `abook` - a terminal-based address book. Pressing tab while typing an address to send mail to will suggest contacts that are in your abook.
 - A cron manager - if you want to enable the auto-sync feature.
diff --git a/mw.1 b/mw.1
index ef69bf8..5dafe0c 100644
--- a/mw.1
+++ b/mw.1
@@ -42,6 +42,7 @@ it will be kept in
 .B notmuch
 can be used to index and search this mail by giving this directory when first running
 .B notmuch setup.
+If you have not set up notmuch before, mutt-wizard will automatically set it up in the background the first time you add an account.
 .TP
 .B muttrc files
 mutt-wizard will create a muttrc file for each created account holding account-specific details. These will appear in