diff --git a/meli.1 b/meli.1
index f7150d26d..206dce08f 100644
--- a/meli.1
+++ b/meli.1
@@ -144,9 +144,9 @@ alias:
 .Pc
 String keywords with spaces must be quoted. Quotes should always be escaped.
 .sp
-.Sy Important Notice about IMAP
+.Sy Important Notice about IMAP/JMAP
 .sp
-To prevent downloading all your messages from your IMAP server, don't set
+To prevent downloading all your messages from your IMAP/JMAP server, don't set
 .Em cache_type
 to
 .Em sqlite3 Ns
@@ -155,7 +155,7 @@ to
 will relay your queries to the IMAP server. Expect a delay between query and response. Sqlite3 on the contrary at reasonable mailbox sizes should have a non noticable delay.
 .Sh TAGS
 .Nm
-supports tagging in notmuch and IMAP backends. Tags can be searched with the `tags:` or `flags:` prefix in a search query, and can be modified by
+supports tagging in notmuch and IMAP/JMAP backends. Tags can be searched with the `tags:` or `flags:` prefix in a search query, and can be modified by
 .Cm tag add TAG
 and
 .Cm tag remove TAG
@@ -464,7 +464,7 @@ XDG Standard
 .Aq https://standards.freedesktop.org/basedir-spec/basedir-spec-latest.html Ns
 , maildir
 .Aq https://cr.yp.to/proto/maildir.html Ns
-, IMAPv4rev1 RFC3501.
+, IMAPv4rev1 RFC3501, The JSON Meta Application Protocol (JMAP) RFC8620, The JSON Meta Application Protocol (JMAP) for Mail RFC8621.
 .Sh AUTHORS
 Copyright 2017-2019
 .An Manos Pitsidianakis Aq epilys@nessuent.xyz
diff --git a/meli.conf.5 b/meli.conf.5
index 0f54a535b..f587f3b63 100644
--- a/meli.conf.5
+++ b/meli.conf.5
@@ -110,7 +110,7 @@ available options are listed below.
 .Bl -tag -width 36n
 .It Ic root_folder Ar String
 the backend-specific path of the root_folder, usually INBOX.
-.It Ic format Ar String Op maildir mbox imap notmuch
+.It Ic format Ar String Op maildir mbox imap notmuch jmap
 the format of the mail backend.
 .It Ic subscribed_folders Ar [String,]
 an array of folder paths to display in the UI. Paths are relative to the root folder (eg "INBOX/Sent", not "Sent").
@@ -186,6 +186,23 @@ example:
 .\" default value
 .Pq Em false
 .El
+.Sh JMAP only
+JMAP specific options are:
+.Bl -tag -width 36n
+.It Ic server_hostname Ar String
+example:
+.Qq mail.example.tld
+.It Ic server_username Ar String
+.It Ic server_password Ar String
+.It Ic server_port Ar number
+(optional)
+.\" default value
+.Pq Em 443
+.It Ic danger_accept_invalid_certs Ar boolean
+(optional) do not validate TLS certificates.
+.\" default value
+.Pq Em false
+.El
 .Sh FOLDERS
 .Bl -tag -width 36n
 .It Ic rename Ar String