diff --git a/README.rst b/README.rst
index dacd432..85f6875 100644
--- a/README.rst
+++ b/README.rst
@@ -25,6 +25,53 @@ How to install
 Changelog
 ==============
 
+0.23.0 (2015-08-14)
+-------------------------
+
+- Update to libgit2 v0.23
+  `#540 <https://github.com/libgit2/pygit2/pull/540>`_
+
+- Now ``Repository.merge_base(...)`` returns ``None`` if no merge base is found
+  `#550 <https://github.com/libgit2/pygit2/pull/550>`_
+
+- Documentation updates
+  `#547 <https://github.com/libgit2/pygit2/pull/547>`_
+
+API changes:
+
+- How to set identity (aka signature) in a reflog has changed::
+
+    # Before
+    signature = Signature('foo', 'bar')
+    ...
+    reference.set_target(target, signature=signature, message=message)
+    repo.set_head(target, signature=signature)
+    remote.fetch(signature=signature)
+    remote.push(signature=signature)
+
+    # Now
+    repo.set_ident('foo', 'bar')
+    ...
+    reference.set_target(target, message=message)
+    repo.set_head(target)
+    remote.push()
+
+    # The current identity can be get with
+    repo.ident
+
+- Some remote setters have been replaced by methods::
+
+    # Before                       # Now
+    Remote.url = url               Repository.remotes.set_url(name, url)
+    Remote.push_url = url          Repository.remotes.set_push_url(name, url)
+
+    Remote.add_fetch(refspec)      Repository.remotes.add_fetch(name, refspec)
+    Remote.add_push(refspec)       Repository.remotes.add_push(name, refspec)
+
+    Remote.fetch_refspecs = [...]  removed, use the config API instead
+    Remote.push_refspecs = [...]   removed, use the config API instead
+
+
 0.22.1 (2015-07-12)
 -------------------------
 
diff --git a/docs/conf.py b/docs/conf.py
index 11e86c2..64d8ed6 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -50,9 +50,9 @@ copyright = u'2010-2014 The pygit2 contributors'
 # built documents.
 #
 # The short X.Y version.
-version = '0.22'
+version = '0.23'
 # The full version, including alpha/beta/rc tags.
-release = '0.22.1'
+release = '0.23.0'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.
diff --git a/docs/general.rst b/docs/general.rst
index 1518972..6671fe2 100644
--- a/docs/general.rst
+++ b/docs/general.rst
@@ -18,7 +18,7 @@ library that has been built against. The version number has a
 .. py:data:: LIBGIT2_VER_MAJOR
 
    Integer value of the major version number. For example, for the version
-   ``0.22.0``::
+   ``0.23.0``::
 
       >>> print LIBGIT2_VER_MAJOR
       0
@@ -26,7 +26,7 @@ library that has been built against. The version number has a
 .. py:data:: LIBGIT2_VER_MINOR
 
    Integer value of the minor version number. For example, for the version
-   ``0.22.0``::
+   ``0.23.0``::
 
       >>> print LIBGIT2_VER_MINOR
       22
@@ -34,7 +34,7 @@ library that has been built against. The version number has a
 .. py:data:: LIBGIT2_VER_REVISION
 
    Integer value of the revision version number. For example, for the version
-   ``0.22.0``::
+   ``0.23.0``::
 
       >>> print LIBGIT2_VER_REVISION
       0
@@ -44,7 +44,7 @@ library that has been built against. The version number has a
    The libgit2 version number as a string::
 
       >>> print LIBGIT2_VERSION
-      '0.22.0'
+      '0.23.0'
 
 Errors
 ======
diff --git a/docs/install.rst b/docs/install.rst
index be53a7d..018080d 100644
--- a/docs/install.rst
+++ b/docs/install.rst
@@ -14,7 +14,7 @@ Requirements
 ============
 
 - Python 2.7, 3.2+ or pypy (including the development headers)
-- Libgit2 v0.22.x
+- Libgit2 v0.23.x
 - cffi 0.8.1+
 - Libssh2, optional, used for SSH network operations.
 - pkg-config, optional, used for SSH network operations.
@@ -35,11 +35,11 @@ while the last number |lq| *.micro* |rq| auto-increments independently.
 
 As illustration see this table of compatible releases:
 
-+-----------+--------+--------+----------------------------------------+
-|**libgit2**| 0.23.0 | 0.22.0 | 0.21.1, 0.21.2                         |
-+-----------+--------+--------+----------------------------------------+
-|**pygit2** | 0.23.0 | 0.22.0 | 0.21.0, 0.21.1, 0.21.2, 0.21.3, 0.21.4 |
-+-----------+--------+--------+----------------------------------------+
++-----------+--------+----------------+----------------------------------------+
+|**libgit2**| 0.23.0 | 0.22.0, 0.22.1 | 0.21.1, 0.21.2                         |
++-----------+--------+----------------+----------------------------------------+
+|**pygit2** | 0.23.0 | 0.22.0         | 0.21.0, 0.21.1, 0.21.2, 0.21.3, 0.21.4 |
++-----------+--------+----------------+----------------------------------------+
 
 .. warning::
 
diff --git a/pygit2/_utils.py b/pygit2/_utils.py
index 2c9e68b..f7b0714 100644
--- a/pygit2/_utils.py
+++ b/pygit2/_utils.py
@@ -42,7 +42,7 @@ import sys
 #
 # The version number of pygit2
 #
-__version__ = '0.22.1'
+__version__ = '0.23.0'
 
 
 #