diff --git a/.mailmap b/.mailmap
index d350cf54..bda64d80 100644
--- a/.mailmap
+++ b/.mailmap
@@ -1,4 +1,8 @@
-Christopher J. Markiewicz <markiewicz@stanford.edu> Chris Markiewicz <effigies@gmail.com>
-Christopher J. Markiewicz <markiewicz@stanford.edu> Chris Markiewicz <markiewicz@stanford.edu>
-Alejandro de la Vega <aleph4@gmail.com> adelavega <delavega@utexas.edu>
-Alejandro de la Vega <aleph4@gmail.com> delavega4 <aleph4@gmail.com>
+Alejandro de la Vega <aleph4@gmail.com>
+Alejandro de la Vega <aleph4@gmail.com> <delavega@utexas.edu>
+Christopher J. Markiewicz <markiewicz@stanford.edu>
+Christopher J. Markiewicz <markiewicz@stanford.edu> <effigies@gmail.com>
+Dylan Nielson <adenosine@gmail.com>
+Karolina Finc <karolinafinc@gmail.com>
+Mathias Goncalves <goncalves.mathias@gmail.com> <mathiasg@mit.edu>
+Rastko Ciric <rc042010@mymail.pomona.edu>
diff --git a/.zenodo.json b/.zenodo.json
index 3d04f395..adbfd933 100644
--- a/.zenodo.json
+++ b/.zenodo.json
@@ -35,6 +35,11 @@
       "name": "Goncalves, Mathias",
       "orcid": "0000-0002-7252-7771"
     },
+    {
+      "affiliation": "National Institute of Mental Health",
+      "name": "Nielson, Dylan M.",
+      "orcid": "0000-0003-4613-6643"
+    },
     {
       "name": "Poldrack, Russell A.",
       "affiliation": "Department of Psychology, Stanford University",
diff --git a/CHANGES.md b/CHANGES.md
index fd6659ea..6691b3e0 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -1,3 +1,32 @@
+0.6.0 (December 11, 2019)
+=========================
+
+New feature release in the 0.6.x series.
+
+This release respects recent changes to the BIDS-StatsModels draft
+specification to support fixed-effects meta-analysis (FEMA) contrasts,
+and renames "AutoContrasts" to "DummyContrasts".
+
+Provisional support for F-tests has been added.
+
+Additional rearchitecting by Dylan Nielson provides significant speedups
+for large datasets by caching BIDS layout information.
+
+* SPEC: Add fixed effects (FEMA) contrasts (https://github.com/poldracklab/fitlins/pull/191)
+* SPEC: Change AutoContrasts to DummyContrasts (https://github.com/poldracklab/fitlins/pull/197)
+* FIX: Don't pass ignore and force index to `init_fitlins_wf` (https://github.com/poldracklab/fitlins/pull/202)
+* FIX: BIDSelect confusion between Nifti and JSON (https://github.com/poldracklab/fitlins/pull/193)
+* FIX: Set `smoothing_fwhm` after creating next level. (https://github.com/poldracklab/fitlins/pull/190)
+* FIX: Recognize cosine columns without underscores (https://github.com/poldracklab/fitlins/pull/185)
+* ENH: Update logging levels (https://github.com/poldracklab/fitlins/pull/198)
+* ENH: Add option to load BIDS layouts from database file (https://github.com/poldracklab/fitlins/pull/187)
+* ENH: Add memory estimate for first-level models, enable memory management (https://github.com/poldracklab/fitlins/pull/199)
+* ENH: Avoid casting BOLD data to float64 if possible (https://github.com/poldracklab/fitlins/pull/196)
+* ENH: Add F-tests (https://github.com/poldracklab/fitlins/pull/195)
+* ENH: Drop missing model inputs (https://github.com/poldracklab/fitlins/pull/183)
+* RF: Abstract interfaces to simplify swappability (https://github.com/poldracklab/fitlins/pull/188)
+
+
 0.5.1 (September 23, 2019)
 ==========================