diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index 7c2e5565653..34fee332861 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -8,6 +8,38 @@
 
 .. towncrier release notes start
 
+Pytest 3.1.2 (2017-06-08)
+=========================
+
+Bug Fixes
+---------
+
+- Required options added via ``pytest_addoption`` will no longer prevent using
+  --help without passing them. (#1999)
+
+- Respect ``python_files`` in assertion rewriting. (#2121)
+
+- Fix recursion error detection when frames in the traceback contain objects
+  that can't be compared (like ``numpy`` arrays). (#2459)
+
+- ``UnicodeWarning`` is issued from the internal pytest warnings plugin only
+  when the message contains non-ascii unicode (Python 2 only). (#2463)
+
+- Added a workaround for Python 3.6 WindowsConsoleIO breaking due to Pytests's
+  FDCapture. Other code using console handles might still be affected by the
+  very same issue and might require further workarounds/fixes, i.e. colorama.
+  (#2467)
+
+
+Improved Documentation
+----------------------
+
+- Fix internal API links to ``pluggy`` objects. (#2331)
+
+- Make it clear that ``pytest.xfail`` stops test execution at the calling point
+  and improve overall flow of the ``skipping`` docs. (#810)
+
+
 Pytest 3.1.1 (2017-05-30)
 =========================
 
diff --git a/changelog/1999.bugfix b/changelog/1999.bugfix
deleted file mode 100644
index 5321b6c2197..00000000000
--- a/changelog/1999.bugfix
+++ /dev/null
@@ -1,2 +0,0 @@
-Required options added via ``pytest_addoption`` will no longer prevent
-using --help without passing them.
diff --git a/changelog/2121.bugfix b/changelog/2121.bugfix
deleted file mode 100644
index 15fd7706c58..00000000000
--- a/changelog/2121.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Respect ``python_files`` in assertion rewriting.
diff --git a/changelog/2331.doc b/changelog/2331.doc
deleted file mode 100644
index 239f67318e5..00000000000
--- a/changelog/2331.doc
+++ /dev/null
@@ -1 +0,0 @@
-Fix internal API links to ``pluggy`` objects.
diff --git a/changelog/2459.bugfix b/changelog/2459.bugfix
deleted file mode 100644
index 66cf9562453..00000000000
--- a/changelog/2459.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Fix recursion error detection when frames in the traceback contain objects that can't be compared (like ``numpy`` arrays).
diff --git a/changelog/2463.bugfix b/changelog/2463.bugfix
deleted file mode 100644
index b980cb3b578..00000000000
--- a/changelog/2463.bugfix
+++ /dev/null
@@ -1,2 +0,0 @@
-``UnicodeWarning`` is issued from the internal pytest warnings plugin only when the message contains non-ascii
-unicode (Python 2 only).
diff --git a/changelog/2467.bugfix b/changelog/2467.bugfix
deleted file mode 100644
index e67110b64ea..00000000000
--- a/changelog/2467.bugfix
+++ /dev/null
@@ -1,3 +0,0 @@
-Added a workaround for Python 3.6 WindowsConsoleIO breaking due to Pytests's
-FDCapture. Other code using console handles might still be affected by the
-very same issue and might require further workarounds/fixes, i.e. colorama.
diff --git a/changelog/810.doc b/changelog/810.doc
deleted file mode 100644
index dc1d3e52c20..00000000000
--- a/changelog/810.doc
+++ /dev/null
@@ -1 +0,0 @@
-Make it clear that ``pytest.xfail`` stops test execution at the calling point and improve overall flow of the ``skipping`` docs.
diff --git a/doc/en/announce/index.rst b/doc/en/announce/index.rst
index 282e9d9f457..dbb4e24d60c 100644
--- a/doc/en/announce/index.rst
+++ b/doc/en/announce/index.rst
@@ -6,6 +6,7 @@ Release announcements
    :maxdepth: 2
 
    
+   release-3.1.2
    release-3.1.1
    release-3.1.0
    release-3.0.7
diff --git a/doc/en/announce/release-3.1.2.rst b/doc/en/announce/release-3.1.2.rst
new file mode 100644
index 00000000000..60168a857ba
--- /dev/null
+++ b/doc/en/announce/release-3.1.2.rst
@@ -0,0 +1,23 @@
+pytest-3.1.2
+=======================================
+
+pytest 3.1.2 has just been released to PyPI.
+
+This is a bug-fix release, being a drop-in replacement. To upgrade::
+
+  pip install --upgrade pytest
+  
+The full changelog is available at http://doc.pytest.org/en/latest/changelog.html.
+
+Thanks to all who contributed to this release, among them:
+
+* Andreas Pelme
+* ApaDoctor
+* Bruno Oliveira
+* Florian Bruhin
+* Ronny Pfannschmidt
+* Segev Finer
+
+
+Happy testing,
+The pytest Development Team
diff --git a/doc/en/skipping.rst b/doc/en/skipping.rst
index 3903844baa0..72b7b043323 100644
--- a/doc/en/skipping.rst
+++ b/doc/en/skipping.rst
@@ -322,8 +322,6 @@ Running it with the report-on-xfail option gives this output::
     
     ======= 7 xfailed in 0.12 seconds ========
 
-
-
 .. _`skip/xfail with parametrize`:
 
 Skip/xfail with parametrize