diff --git a/AUTHORS.md b/AUTHORS.md
index d349bc97f..2d8e6475b 100644
--- a/AUTHORS.md
+++ b/AUTHORS.md
@@ -39,6 +39,8 @@
 - Caleb Mclennan
 - Calvin Beck
 - Carlos Sosa
+- Cécile Chemin
+- Cédric Couralet
 - Chris Black
 - Christian Conkle
 - Christian Despres
@@ -104,6 +106,7 @@
 - J. B. Rainsberger
 - J. Lewis Muir
 - Jaime Marquínez Ferrándiz
+- Jake Zimmerman
 - Jakob Voß
 - James Aspnes
 - Jamie F. Olson
@@ -131,6 +134,7 @@
 - Josef Svenningsson
 - Joseph C. Sible
 - Julien Cretel
+- Juliette Fourcot
 - Juliusz Gonera
 - Justin Bogner
 - Jérémy Bobbio
@@ -145,6 +149,7 @@
 - Lars-Dominik Braun
 - Laurent P. René de Cotret
 - Leif Metcalf
+- Lila
 - Lucas Escot
 - Luke Plant
 - Marc Schreiber
@@ -206,6 +211,7 @@
 - Recai Oktaş
 - Roland Hieber
 - RyanGlScott
+- Salim B
 - Sascha Wilde
 - Scott Morrison
 - Sebastian Talmon
@@ -239,6 +245,7 @@
 - Vasily Alferov
 - Viktor Kronvall
 - Vincent
+- Vlad Hanciuta
 - Wandmalfarbe
 - Waldir Pimenta
 - Wikiwide
diff --git a/changelog.md b/changelog.md
index 638141453..467128b8f 100644
--- a/changelog.md
+++ b/changelog.md
@@ -1,5 +1,374 @@
 # Revision history for pandoc
 
+## pandoc 2.10 (YYYY-MM-DD)
+
+  * Use pandoc-types 1.21.  This adds two things:
+
+    + A native Underline constructor for Inline (#6277, Vaibhav Sagar).
+    + More expressive types for tables (#1024, Christian Despres).
+      Tables can now take attributes; and rowspans and colspans,
+      column headers, multiple row headers, table head and foot
+      can all be represented.  (Note, however, that reader and
+      writer support for these features is still lacking, so
+      most users won't see any differences in table conversion
+      yet.  These changes just lay the foundation for further
+      improvements.)
+
+  * Support new Underline element in readers and writers (#6277,
+    Vaibhav Sagar).
+
+  * Support new Table type (Christian Despres).
+    The Builder.simpleTable now only adds a row to the TableHead
+    when the given header row is not null. This uncovered an
+    inconsistency in the readers: some would unconditionally
+    emit a header filled with empty cells, even if the header
+    was not present. Now every reader has the conditional
+    behaviour.  Only the XWiki writer depended on the header row
+    being always present; it now pads its head as necessary.
+
+  * Add an option to disable certificate validation (#6156, Cédric Couralet,
+    Cécile Chemin, Juliette Fourcot).  This commit adds the option
+    `--no-check-certificate`, which disables certificate checking when
+    resources are fetched by HTTP.
+
+  * Docbook reader:
+
+    + Implement `<procedure>` (#6442, Mathieu Boespflug).
+    + Implement `<phrase>` (#6438, Mathieu Boespflug).
+    + Treat envar and systemitem like code (#6435, Mathieu Boespflug).
+    + Implement `<replaceable>` (#6437, Mathieu Boespflug)
+    + Map `<simplesect>` to unnumbered section (#6436, Mathieu Boespflug).
+
+  * JATS reader: handle "label" element in section title (#6288).
+
+  * Jira reader (Albert Krewinkel):
+
+    + Resolve multiple parsing problems, including issues with empty
+      table cells, faulty recognition of closing emphasis characters, and
+      parsing of image attributes (#6212, #6219, #6220).
+    + Require jira-wiki-markup 1.3.1 or later.
+      This solves the following problems: Two consecutive markup
+      chars are now parsed verbatim (#6343); styled text must
+      not be empty.  Styled text may not contain newlines
+      (#6325).  Links to anchors are now parsed as links
+      (#6407).
+    + Retain image attributes (#6234).  Jira images attributes as in
+      `!image.jpg|align=right!` are retained as key-value pairs. Thumbnail
+      images, such as `!example.gif|thumbnail!`, are marked by a
+      `thumbnail` class in their attributes.
+    + Read `(?)` icon as "small questionmark" character (#6236).
+    + Use Underline for inserted text (#6237). Previously, the
+        span was marked with the non-standard class `inserted`.
+        Closes: #6237
+    + Improve icon conversion for `(/)`, `(x)`, `(!)`,
+      `(+)`, `(-)`, `(off)`, `(*)`. (#6264).
+    + Support citations, attachment links, and user links (#6231, #6238,
+      #6239).
+    + Resolve parsing issues of blockquote, color (#6233, #6235).
+
+  * HTML reader:
+
+    + Parse attributes into table attributes.
+    + Support `<bdo>` (#5794, Tristan de Cacqueray).
+    + Add `summary` to list of block-level HTML tags (#6385).
+      This improves support for summary/details inside Markdown.
+      NOTE:  you need to include a blank line before the closing
+      `</details>`, if you want the last part of the content to
+      be parsed as a paragraph.
+    + Fix parsing unclosed th elements in a table (#6247).
+
+  * Commonmark reader: Implement `implicit_figures` extension (#6350).
+
+  * Markdown Reader:
+
+    + Fix inline code in lists (#6284, Nikolay Yakimov).
+      Previously inline code containing list markers was sometimes
+      parsed incorrectly.
+
+  * LaTeX reader:
+
+    + Don't parse beyond `\end{document}` (#6380).
+      This required some internal changes to `\subfile` handling.
+    + Better handling of `\lettrine`.  SmallCaps instead of Span
+      for the part after the initial capital.  Ensure that both
+      arguments are parsed, so that in Markdown both
+      are treated as raw LateX. (Closes #6258.)
+    + Don't put surrounding Div around Table.
+      This reverts a change in the last release; the Div is
+      no longer needed, because we can now put the id right in
+      the Table's attributes.  However, writers may still need
+      to be modified to do something with the id in a Table
+      (e.g. create an anchor), so in the short term we may lose
+      the ability to link to tables in some writers.
+
+  * Org reader (Albert Krewinkel):
+
+    + Recognize images with uppercase extensions (#6472).
+
+  * RST reader:
+
+    + Pass arbitrary attributes through in code blocks (#6465).
+      Exceptions: name (which becomes the id), class (which becomes the
+      classes), and number-lines (which is treated specially to fit
+      with pandoc highlighting).
+    + Handle `date::` directive (#6276).
+
+  * Textile reader: support `pre.` for code blocks (#6454).
+
+  * Ipynb reader:
+
+    + Handle application/pdf output as image (#6430).
+    + Properly handle image/svg+xml as an image (#6430).
+
+  * Docx reader:
+
+    + Distinguish between docx parsing and docx container unpacking errors.
+
+  * MediaWiki reader:
+
+    + Fix `gfm_auto_identifiers` so that `-` is not replaced by `_` (#6335).
+
+  * Vimwiki reader:
+
+    + Add nested syntax highlighting (#6256, Vlad Hanciuta).
+      Nested syntaxes are specified like this:
+      ```
+      {{{sql
+      SELECT * FROM table
+      }}}
+      ```
+      The preformatted code block parser has been extended to check if the
+      first attribute of the block is not a `key=value` pair, and in that
+      case it will be considered as a class.
+
+
+  * Jira writer (Albert Krewinkel):
+
+    + Always escape braces (#6478).  Braces are now always escaped, even
+      within words or when surrounded by whitespace. Jira and
+      Confluence treat braces specially.
+    + Convert Underline to inserted text (`+inserted+`).
+    + Add image attributes (#6234).  Image attributes are added
+      to the output as image parameters. If the image has a
+      class "thumbnail", then a thumbnail image is generated;
+      all other attributes are discarded in this case.
+
+  * LaTeX writer:
+
+    + Ensure that `-M csquotes` works even in fragment mode (#6265).
+    + Escape `^` specially for listings (#6460).
+    + Create hypertarget for links with identifier (#6360).
+    + Distinguish between single and double quotes when using enquote
+      package (#6457, dbecher-ito).
+    + Add support for customizable alignment of columns in beamer (#6331,
+      andrebauer).
+    + Add support for customizable alignment of columns in beamer
+      (#4805, #4150, andrebauer).
+
+  * HTML writer:
+
+    + Use CSS in favor of `<br>` for display math (#6372)
+      Some CSS to ensure that display math is
+      displayed centered and on a new line is now included
+      in the default HTML-based templates; this may be
+      overridden if the user wants a different behavior.
+
+  * Org writer:
+
+    + Clean-up Div handling (Albert Krewinkel).
+
+  * Docx writer:
+
+    + Enable column and row bands for tables (#6371).
+      This change will not have any effect with the default style.
+      However, it enables users to use a style (via a reference.docx)
+      that turns on row and/or column bands.
+
+  * OpenDocument (and ODT) writer:
+
+    + Add custom-style "Abstract" in metadata abstract.
+      This ensures that the abstract is rendered with style Abstract.
+    + Enable custom-style attribute on a Div.
+      This allows you to apply a custom style to contained paragraphs.
+
+  * DocBook writer:
+
+    + Add id of figure to enclosed image.
+    + Add personname element to docbook author (#6244).
+
+  * FB2 writer:
+
+    + Properly handle cover-image containing spaces (#6391).
+
+  * Markdown writer:
+
+    + Ensure consistent padding for pipe tables (#6240).
+    + Avoid unnecessary escapes before intraword `_` when
+      `intraword_underscores` extension is enabled (#6296).
+
+  * RST writer:
+
+    + Properly handle images with same alt text (#6194).
+      Previously we created duplicate references for these in rendering RST.
+
+  * AsciiDoc writer:
+
+    + Add blank line after Div (#6308).
+
+  * Haddock Writer:
+
+    + Support Haddock tables (Joe Hermaszewski).
+      See this PR on Haddock for details on the table format:
+      <https://github.com/haskell/haddock/pull/718>.
+
+  * PowerPoint writer (Jesse Rosenthal):
+
+    + Write math input verbatim in speaker notes (#6301).
+      OMML in speaker notes would lead to corrupt PowerPoint output. We now
+      output the OMML verbatim as LaTeX in the speaker notes.
+
+  * LaTeX template: Make polyglossia package options list-aware
+    (#6444, Frederik Elwert).
+
+  * Reveal.js template:
+
+    + Update template for reveal.js 4.0.0 (#6390, Salim B).
+    + Update template with newly available options (#6347, Jake Zimmerman).
+    + Use CDN version of revealjs v4 by default (#6408).
+
+  * opendocument template: Add abstract and subtitle to opendocument
+    template (#6369).
+
+  * reference.odt: clean up styles.  Add Abstract.
+    Change Author, Date to centered paragraphs with no character
+    styling.
+
+  * epub.css: wrap overlong lines in highlighted code blocks (#6242).
+    This fixes a problem in iBooks v2.4 with our earlier
+    horizontally scrolling code blocks.  The problem seems to
+    be a bug in iBooks, not pandoc, but since iBooks is a major
+    target we're changing pandoc's default behavior so that
+    pandoc-produced epubs work on that platform.
+
+  * Text.Pandoc.PDF:
+
+    + Use `--enable-local-file-access` in invoking `wkhtmltopdf` (#6474).
+      `wkhtmltopdf` changed in recent versions to require this for
+      access to local files.  This fixes PDF via HTML5 with `--css`.
+
+  * Text.Pandoc.MIME: Fix MIME type for TrueType fonts in EPUBs
+    (#6464, Michael Reed).
+
+  * Text.Pandoc.Shared:
+
+    + `makeSections`: omit number attribute when unnumbered class
+      is present (#6339).  Previously the attribute was included but given
+      an empty value, and this caused the table of contents creation
+      functions in Text.Pandoc.Writers.Shared to think these items had
+      numbers, which meant that they were included in the TOC even if the
+      `unlisted` class was used.
+    + Deprecate `underlineSpan` in Shared in favor of
+      `Text.Pandoc.Builder.underline` (Vaibhav Sagar).
+    + `renderTags'`: use self-closing tag for col element (#6295).
+
+  * Text.Pandoc.UUID: Fix `getRandomUUID`, which previously would
+    return the same value twice in a row. Make `getRandomUUID`
+    polymorphic in PandocMonad.  Remove `getUUID` (#6228, Joseph C. Sible).
+
+  * Text.Pandoc.Class: Generalize `PandocIO` functions to `MonadIO`.
+
+  * Fixed Katex standalone script (#6399, Lucas Escot).
+    Global macros are now persistent when using the HTML Writer with the
+    `--katex` option.
+
+  * Lua subsystem (Albert Krewinkel):
+
+    + Fix regression in package searcher (#6361).
+      This caused `require 'module'` to fail for third party packages.
+    + Use new type PandocLua for all pandoc Lua operations (API change).
+      The new type `PandocLua` is an instance of the `PandocMonad` typeclass
+      and can thus be used in a way similar to `PandocIO`.
+    + Use PandocError for exceptions in Lua subsystem (API change).
+      The PandocError type is used throughout the Lua subsystem. All Lua
+      functions throw an exception of this type if an error occurs. The
+      `LuaException` type is removed and no longer exported from
+      `Text.Pandoc.Lua`. In its place, a new constructor `PandocLuaError`
+      is added to PandocError.
+
+  * Lua filters: improve error messages for failing filters (#6332,
+    Albert Krewinkel).  Print the Lua error properly instead of
+    displaying their `show` string.
+
+  * Use latest skylighting.  This fixes a bug with lua multiline
+    comments (and may improve handling of other syntaxes as well).
+    IT also adds `aria-hidden="true"` to the empty a elements, which
+    helps people who use screen readers.
+
+  * Use latest texmath.
+
+  * Require latest doctemplates 0.8.2.
+    This adds support for template pipes `first`, `rest`,
+    `last`, `allbutlast`.
+
+  * Revert  0e48a02 and dependency on base-noprelude, which hasn't
+    been updated for ghc 8.10 (see #6187).
+
+  * Dependency adjustments:
+
+    + Allow haddock-library 1.9.x.
+    + Allow hslua 1.1 (#6243, Felix Yan).
+    + Allow base64-bytestring 1.1.
+    + Use latest jira-wiki-markup.
+    + Allow http-client 0.7.
+    + Allow tasty 1.3.x.
+    + Allow aeson 1.5 (#6400, Felix Yan).
+    + Remove unused dependency `vector` (#6462, Laurent P. René de Cotret).
+    + Bump QuickCheck upper bound.
+
+  * Significant code cleanup and simplification (Joseph C. Sible, #6223,
+    #6209, #6225, #6229, #6226, #6340).
+
+  * Remove unnecessary hlint ignores (#6341, Joseph C. Sible).
+
+  * trypandoc improvements (Mike Tzou):
+
+    + Add standalone option to the command text (#6210).
+    + Update third party libraries.
+
+  * MANUAL.txt:
+
+    + Clarify template partial naming (#6476, Mauro Bieg).
+    + Describe `jira` as "Jira/Confluence wiki markup" (#6351, Albert
+      Krewinkel).  In the past, Jira's wiki markup was also used by -- and
+      could be imported into -- Atlassian Confluence.
+    + Add link to print-css.rocks (#6272, Mauro Bieg).
+    + Clarify pipe table column width adjustment (#6254).
+    + Fix ATX header syntax.
+    + Fix misleading note about image size conversions (#6353).
+    + Update links to reveal.js documentation (#6386, Salim B).
+    + Separate adjacent verbatim code blocks (#6307, tom-audm).
+
+  * lua-filters.md:
+
+    + Fix description of BulletList Lua type (Levi Gruspe).
+    + Use pandoc.system module in TikZ example (Albert
+      Krewinkel).  Showcase temporary directory handling with
+      `with_temporary_directory` and `with_working_directory`.
+
+  * INSTALL.md: fix FreeBSD port link (#6422, Mo).
+    The FreeBSD port was renamed from pandoc to hs-pandoc in 2010.
+    The old pandoc port is still at version 1.5.1.1
+
+  * Propagate `(DY)LD_LIBRARY_PATH` in tests (#6376, Lila).
+
+  * Bump `cabal-version` to 2.2 (#6377).
+
+  * Make it possible to compile using Stack on NixOS (#6439, Mathieu
+    Boespflug).
+
+  * CI action to check for commit messsage length (Nikolay Yakimov, #6398).
+
+
 ## pandoc 2.9.2.1 (2020-03-23)
 
   * Markdown reader: Fix table alignment when heading begins with t (#6153).