diff --git a/.mailmap b/.mailmap
index 453de86..710e4ef 100644
--- a/.mailmap
+++ b/.mailmap
@@ -1,9 +1,14 @@
 Carlos Martín Nieto <cmn@dwim.me> <carlos@cmartin.tk>
 Christian Boos <cboos@edgewall.org> <cboos@bct-technology.com>
+Gustavo Di Pietro <pistacchio@gmail.com>
 J. David Ibáñez <jdavid.ibp@gmail.com> <jdavid@itaapy.com>
 Martin Lenders <mlenders@elegosoft.com> <authmill@datalove.me>
+Óscar San José <osanjose@tuenti.com>
 Richo Healey <richo@psych0tik.net>
 Xavier Delannoy <xavier.delannoy@gmail.com>
 Xu Tao <xutao881001@gmail.com> <xutao@douban.com>
 Xu Tao <xutao881001@gmail.com>
+
+<bravejolie@gmail.com> <victor@tuenti.com>
+<jplana@tuenti.com> <jplana@gmail.com>
 <petrhosek@gmail.com> <p.hosek@imperial.ac.uk>
diff --git a/README.rst b/README.rst
index bd24813..5d116a7 100644
--- a/README.rst
+++ b/README.rst
@@ -44,40 +44,42 @@ for the topic), send a pull request.
 Authors
 ==============
 
-52 developers have contributed at least 1 commit to pygit2::
+56 developers have contributed at least 1 commit to pygit2::
 
   J. David Ibáñez                          Andrey Devyatkin
   Nico von Geyso                           Ben Davis
-  Carlos Martín Nieto                      Hervé Cauwelier
-  W. Trevor King                           Huang Huang
-  Dave Borowitz                            Jared Flatow
-  Daniel Rodríguez Troitiño                Jiunn Haur Lim
-  Richo Healey                             Sarath Lakshman
-  Christian Boos                           Vicent Marti
-  Julien Miotte                            Zoran Zaric
-  Martin Lenders                           Andrew Chin
+  Carlos Martín Nieto                      Eric Schrijver
+  W. Trevor King                           Hervé Cauwelier
+  Dave Borowitz                            Huang Huang
+  Daniel Rodríguez Troitiño                Jared Flatow
+  Richo Healey                             Jiunn Haur Lim
+  Christian Boos                           Sarath Lakshman
+  Julien Miotte                            Vicent Marti
+  Jose Plana                               Zoran Zaric
+  Martin Lenders                           Adam Spiers
+  Victor Garcia                            Andrew Chin
   Xavier Delannoy                          András Veres-Szentkirályi
   Yonggang Luo                             Benjamin Kircher
-  Valentin Haenel                          Benjamin Pollack
-  Xu Tao                                   Bryan O'Sullivan
-  Bernardo Heynemann                       David Fischer
-  John Szakmeister                         David Sanders
-  Brodie Rao                               Eric Davis
-  Petr Hosek                               Eric Schrijver
-  David Versmisse                          Erik van Zijst
-  Rémi Duraffort                           Ferengee
+  Petr Hosek                               Benjamin Pollack
+  Valentin Haenel                          Bryan O'Sullivan
+  Xu Tao                                   David Fischer
+  Bernardo Heynemann                       David Sanders
+  John Szakmeister                         Eric Davis
+  Brodie Rao                               Erik van Zijst
+  David Versmisse                          Ferengee
+  Rémi Duraffort                           Gustavo Di Pietro
   Sebastian Thiel                          Hugh Cole-Baker
   Fraser Tweedale                          Josh Bleecher Snyder
   Han-Wen Nienhuys                         Jun Omae
-  Petr Viktorin                            Ridge Kennedy
-  Alex Chamberlain                         Rui Abreu Ferreira
-  Amit Bakshi                              pistacchio
+  Petr Viktorin                            Óscar San José
+  Alex Chamberlain                         Ridge Kennedy
+  Amit Bakshi                              Rui Abreu Ferreira
 
 
 Changelog
 ==============
 
-0.20.1 (201X-XX-XX)
+0.20.1 (2013-12-24)
 -------------------
 
 - New remote ref-specs API:
diff --git a/docs/conf.py b/docs/conf.py
index 92253aa..7ec1859 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -50,7 +50,7 @@ copyright = u'2013, J. David Ibáñez'
 # The short X.Y version.
 version = '0.20'
 # The full version, including alpha/beta/rc tags.
-release = '0.20.0'
+release = '0.20.1'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.
diff --git a/docs/install.rst b/docs/install.rst
index 95cba2b..e237037 100644
--- a/docs/install.rst
+++ b/docs/install.rst
@@ -27,7 +27,7 @@ When those are installed, you can install pygit2:
 
 .. note:: A minor version of pygit2 must be used with the corresponding minor
    version of libgit2. For example, pygit2 v0.20.x must be used with libgit2
-   v0.20.0.
+   v0.20.1.
 
 Building on \*nix (including OS X)
 ===================================
diff --git a/pygit2/version.py b/pygit2/version.py
index 428045a..9469822 100644
--- a/pygit2/version.py
+++ b/pygit2/version.py
@@ -23,4 +23,4 @@
 # the Free Software Foundation, 51 Franklin Street, Fifth Floor,
 # Boston, MA 02110-1301, USA.
 
-__version__ = '0.20.0'
+__version__ = '0.20.1'