diff --git a/TODO b/TODO
index 35ae5287..fb3429d1 100644
--- a/TODO
+++ b/TODO
@@ -81,6 +81,7 @@
   - add guile mu:count
   - don't show GPG/PKCS7 sigs as attachments
   - fix address completion (quote names)
+  - add support for X-Keywords (in addition to X-Label)
 
 * Done
   :PROPERTIES:
diff --git a/man/mu-find.1 b/man/mu-find.1
index 5b3492c6..ea96c81a 100644
--- a/man/mu-find.1
+++ b/man/mu-find.1
@@ -1,4 +1,4 @@
-.TH MU FIND 1 "July 2012" "User Manuals"
+.TH MU FIND 1 "August 2012" "User Manuals"
 
 .SH NAME
 
@@ -116,12 +116,12 @@ search fields and their abbreviations:
 	embed,e         Search inside embedded text parts (messages, attachments)
 	file,j          Attachment filename
 	mime,y          MIME-type of one or more message parts
-	tag,x           Tag for the message (contents of the \fIX-Label\fR field)
+	tag,x           Tags for the message (\fIX-Label\fR and/or \fIX-Keywords\fR)
 .fi
 
 For clarity, this man-page uses the longer versions.
 
-The meaning of most of these fields should be clear, but some require some
+`The meaning of most of these fields should be clear, but some require some
 extra discusion.
 
 First, the message flags field describes certain properties of the message, as