diff --git a/README.org b/README.org
index 6b9747fb..daa2861d 100644
--- a/README.org
+++ b/README.org
@@ -167,6 +167,80 @@ The common =ox-hugo= export bindings are:
 Do =M-x customize-group=, and select =org-export-hugo= to see the
 available customization options for this package.
 * Changelog
+** v0.8 <2018-01-26 Fri>
+*** Features
+- Support exporting content files and attachments (images, documents)
+  to Page Bundles organization structure (Hugo v0.32+) --
+  #[[https://github.com/kaushalmodi/ox-hugo/issues/111][111]].
+- Support exporting =resources= front-matter (Hugo v0.33+) --
+  #[[https://github.com/kaushalmodi/ox-hugo/issues/115][115]].
+- Support exporting =headless= front-matter (Hugo v0.35+).
+- Advanced table styling is now possible by specifying =#+ATTR_HTML=
+  and =#+ATTR_CSS= (this one is unique to =ox-html=) above Org
+  tables. See its [[https://ox-hugo.scripter.co/doc/table-styling/][documentation]] -- #[[https://github.com/kaushalmodi/ox-hugo/issues/93][93]].
+  - Similarly, support =#+ATTR_HTML= and =#+ATTR_CSS= for paragraphs,
+    example blocks, source blocks, plain lists and quote blocks too --
+    #[[https://github.com/kaushalmodi/ox-hugo/issues/113][113]].
+- Now =publishdate= and =expirydate= front-matter properties get
+  auto-derived from =SCHEDULED= and =DEADLINE= special properties if
+  associated with the valid Hugo post subtree --
+  commit [[https://github.com/kaushalmodi/ox-hugo/commit/0807f42d][0807f42d]].
+  - Date values can now be easily set using the =C-c .= binding in the
+    =HUGO_PUBLISHDATE= and =HUGO_EXPIRYDATE= properties too.
+- Export source blocks and table captions -- #[[https://github.com/kaushalmodi/ox-hugo/issues/38][38]]. Here's a
+  suggested CSS for the captions:
+  #+BEGIN_SRC css
+    figcaption,
+    .src-block-caption,
+    .table-caption {
+        font-style: italic;
+        text-align: center;
+    }
+  #+END_SRC
+- Export descriptive or definition lists in Blackfriday-friendly
+  Markdown format -- #[[https://github.com/kaushalmodi/ox-hugo/issues/114][114]].
+- Support Org Special Blocks [[https://www.gnu.org/software/emacs/manual/html_node/org/Special-blocks.html][like in HTML and LaTeX exports]] --
+  #[[https://github.com/kaushalmodi/ox-hugo/issues/105][105]]. Here's one little example:
+  #+BEGIN_SRC org
+    ,#+BEGIN_mark
+    /Some/ *marked* text
+    ,#+END_mark
+  #+END_SRC
+- Allow setting =:EXPORT_HUGO_SECTION:= in the valid Hugo post subtree
+  itself.
+- Enable replacing any key in the front-matter with anything; it's
+  even possible to swap the keys now (tags↔categories:
+  commit [[https://github.com/kaushalmodi/ox-hugo/commit/fb21e82c][fb21e82c]]). New keyword:
+  =HUGO_FRONT_MATTER_KEY_REPLACE= -- see commit [[https://github.com/kaushalmodi/ox-hugo/commit/b72a5fb0][b72a5fb0]].
+- Now all the Org keyword values that should get merged, get merged --
+  commit [[https://github.com/kaushalmodi/ox-hugo/commit/38eba6d5][38eba6d5]].
+- Add =title= as a valid property of =menu= front-matter (Hugo
+  v0.32+).
+*** Backward-incompatible changes
+- A "better user-experience" change.. now you do not need to use
+  /double-underscores/ as /space/ replacement in =#+HUGO_TAGS=,
+  =#+HUGO_CATEGORIES= and =#+KEYWORDS=. See this commit for details
+  and examples -- commit [[https://github.com/kaushalmodi/ox-hugo/commit/319435db][319435db]].
+*** Fixes
+- Fix =HUGO_LEVEL_OFFSET= not getting set -- #[[https://github.com/kaushalmodi/ox-hugo/issues/117][117]], thanks
+  @[[https://github.com/shimmy1996][*shimmy1996*]]!
+- Fix internal subtree counter not getting reset after a file-based
+  export.
+- Fix clickable image links with =#+NAME= -- commit [[https://github.com/kaushalmodi/ox-hugo/commit/fef0ec50][fef0ec50]].
+- Make title text rendering more robust.. now Markdown markup
+  characters like =*=, =_= and =`= show up fine, verbatim, in the
+  title.
+- Make em dash, en dash, horizontal ellipsis render in post titles
+  too -- Hugo #[[https://github.com/gohugoio/hugo/issues/4175][4175]] (/Upstream bug fix/), and in source
+  block captions and table captions too.
+- Fix double-escaping of =#= and =![= in Markdown export --
+  #[[https://github.com/kaushalmodi/ox-hugo/issues/110][110]] (/fix in upstream =ox-md.el=/).
+*** Meta
+- Re-write the logic for parsing meta-data for various kinds of dates,
+  and optimize the logic for parsing newline separated lists like tags
+  and categories.
+- The =bare_min= theme used for the test site is made more portable
+  (at some point, that theme might be moved to a separate repo).
 ** v0.7 <2017-12-18 Mon>
 *** Features
 - *Now C-c C-e H H works for both per-subtree and per-file flows* --
diff --git a/doc/github-files.org b/doc/github-files.org
index 62e8bcb6..063e822c 100644
--- a/doc/github-files.org
+++ b/doc/github-files.org
@@ -4,6 +4,7 @@
 #+MACRO: commit commit [[https://github.com/kaushalmodi/ox-hugo/commit/$1][$1]]
 #+MACRO: issue #[[https://github.com/kaushalmodi/ox-hugo/issues/$1][$1]]
 #+MACRO: bfissue Blackfriday # [[https://github.com/russross/blackfriday/issues/$1][$1]]
+#+MACRO: hugoissue Hugo #[[https://github.com/gohugoio/hugo/issues/$1][$1]]
 #+MACRO: imageclick [[https://raw.githubusercontent.com/kaushalmodi/ox-hugo/master/doc/static/images/$1][https://raw.githubusercontent.com/kaushalmodi/ox-hugo/master/doc/static/images/$1]]
 #+MACRO: doc [[https://ox-hugo.scripter.co/doc/$1][$2]]
 #+MACRO: travis [[https://travis-ci.org/kaushalmodi/ox-hugo][https://travis-ci.org/kaushalmodi/ox-hugo.svg?branch=master]]
@@ -11,6 +12,7 @@
 #+MACRO: GPLv3 [[https://www.gnu.org/licenses/gpl-3.0][https://img.shields.io/badge/License-GPL%20v3-blue.svg]]
 #+MACRO: gitter [[https://gitter.im/KaushalModi/Lobby][https://badges.gitter.im/KaushalModi/Lobby.svg]]
 #+MACRO: saythanks [[https://saythanks.io/to/kaushalmodi][https://img.shields.io/badge/Say%20Thanks-!-1EAEDB.svg]]
+#+MACRO: user @[[https://github.com/$1][*$1*]]
 
 * Readme                                                             :readme:
 :PROPERTIES:
diff --git a/doc/ox-hugo-manual.org b/doc/ox-hugo-manual.org
index c7728545..3c0c2882 100644
--- a/doc/ox-hugo-manual.org
+++ b/doc/ox-hugo-manual.org
@@ -10,8 +10,10 @@
 #+MACRO: commit commit [[https://github.com/kaushalmodi/ox-hugo/commit/$1][$1]]
 #+MACRO: issue #[[https://github.com/kaushalmodi/ox-hugo/issues/$1][$1]]
 #+MACRO: bfissue Blackfriday #[[https://github.com/russross/blackfriday/issues/$1][$1]]
+#+MACRO: hugoissue Hugo #[[https://github.com/gohugoio/hugo/issues/$1][$1]]
 #+MACRO: ox-hugo-test-file  [[https://raw.githubusercontent.com/kaushalmodi/ox-hugo/master/test/site/content-org/all-posts.org][=all-posts.org=]]
 #+MACRO: doc [[/doc/$1][$2]]
+#+MACRO: user @[[https://github.com/$1][*$1*]]
 
 * Changelog
 :PROPERTIES:
@@ -22,6 +24,80 @@
 *** Backward-incompatible changes
 *** Fixes
 *** Meta
+** v0.8 <2018-01-26 Fri>
+*** Features
+- Support exporting content files and attachments (images, documents)
+  to Page Bundles organization structure (Hugo v0.32+) --
+  {{{issue(111)}}}.
+- Support exporting =resources= front-matter (Hugo v0.33+) --
+  {{{issue(115)}}}.
+- Support exporting =headless= front-matter (Hugo v0.35+).
+- Advanced table styling is now possible by specifying =#+ATTR_HTML=
+  and =#+ATTR_CSS= (this one is unique to =ox-html=) above Org
+  tables. See its [[https://ox-hugo.scripter.co/doc/table-styling/][documentation]] -- {{{issue(93)}}}.
+  - Similarly, support =#+ATTR_HTML= and =#+ATTR_CSS= for paragraphs,
+    example blocks, source blocks, plain lists and quote blocks too --
+    {{{issue(113)}}}.
+- Now =publishdate= and =expirydate= front-matter properties get
+  auto-derived from =SCHEDULED= and =DEADLINE= special properties if
+  associated with the valid Hugo post subtree --
+  {{{commit(0807f42d)}}}.
+  - Date values can now be easily set using the =C-c .= binding in the
+    =HUGO_PUBLISHDATE= and =HUGO_EXPIRYDATE= properties too.
+- Export source blocks and table captions -- {{{issue(38)}}}. Here's a
+  suggested CSS for the captions:
+  #+BEGIN_SRC css
+  figcaption,
+  .src-block-caption,
+  .table-caption {
+      font-style: italic;
+      text-align: center;
+  }
+  #+END_SRC
+- Export descriptive or definition lists in Blackfriday-friendly
+  Markdown format -- {{{issue(114)}}}.
+- Support Org Special Blocks [[https://www.gnu.org/software/emacs/manual/html_node/org/Special-blocks.html][like in HTML and LaTeX exports]] --
+  {{{issue(105)}}}. Here's one little example:
+  #+BEGIN_SRC org
+  ,#+BEGIN_mark
+  /Some/ *marked* text
+  ,#+END_mark
+  #+END_SRC
+- Allow setting =:EXPORT_HUGO_SECTION:= in the valid Hugo post subtree
+  itself.
+- Enable replacing any key in the front-matter with anything; it's
+  even possible to swap the keys now (tags↔categories:
+  {{{commit(fb21e82c)}}}). New keyword:
+  =HUGO_FRONT_MATTER_KEY_REPLACE= -- see {{{commit(b72a5fb0)}}}.
+- Now all the Org keyword values that should get merged, get merged --
+  {{{commit(38eba6d5)}}}.
+- Add =title= as a valid property of =menu= front-matter (Hugo
+  v0.32+).
+*** Backward-incompatible changes
+- A "better user-experience" change.. now you do not need to use
+  /double-underscores/ as /space/ replacement in =#+HUGO_TAGS=,
+  =#+HUGO_CATEGORIES= and =#+KEYWORDS=. See this commit for details
+  and examples -- {{{commit(319435db)}}}.
+*** Fixes
+- Fix =HUGO_LEVEL_OFFSET= not getting set -- {{{issue(117)}}}, thanks
+  {{{user(shimmy1996)}}}!
+- Fix internal subtree counter not getting reset after a file-based
+  export.
+- Fix clickable image links with =#+NAME= -- {{{commit(fef0ec50)}}}.
+- Make title text rendering more robust.. now Markdown markup
+  characters like =*=, =_= and =`= show up fine, verbatim, in the
+  title.
+- Make em dash, en dash, horizontal ellipsis render in post titles
+  too -- {{{hugoissue(4175)}}} (/Upstream bug fix/), and in source
+  block captions and table captions too.
+- Fix double-escaping of =#= and =![= in Markdown export --
+  {{{issue(110)}}} (/fix in upstream =ox-md.el=/).
+*** Meta
+- Re-write the logic for parsing meta-data for various kinds of dates,
+  and optimize the logic for parsing newline separated lists like tags
+  and categories.
+- The =bare_min= theme used for the test site is made more portable
+  (at some point, that theme might be moved to a separate repo).
 ** v0.7 <2017-12-18 Mon>
 *** Features
 - *Now C-c C-e H H works for both per-subtree and per-file flows* --
diff --git a/ox-hugo.el b/ox-hugo.el
index 8ccdc3ef..78584f0e 100644
--- a/ox-hugo.el
+++ b/ox-hugo.el
@@ -1094,12 +1094,12 @@ cannot be formatted in Hugo-compatible format."
                       (org-string-nw-p
                        (org-export-get-date info hugo-date-fmt))))
                     ((and (equal date-key :hugo-publishdate)
-                          ;; Get the date from the "SCHEDULED" property.
                           (org-entry-get (point) "SCHEDULED"))
+                     ;; Get the date from the "SCHEDULED" property.
                      (org-entry-get (point) "SCHEDULED"))
                     ((and (equal date-key :hugo-expirydate)
-                          ;; Get the date from the "DEADLINE" property.
                           (org-entry-get (point) "DEADLINE"))
+                     ;; Get the date from the "DEADLINE" property.
                      (org-entry-get (point) "DEADLINE"))
                     (t ;:hugo-lastmod, :hugo-publishdate, :hugo-expirydate
                      (org-string-nw-p