diff --git a/CHANGES.rst b/CHANGES.rst
index c10180997..9ff3122d5 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -1,6 +1,14 @@
 Changelog (Pillow)
 ==================
 
+3.1.2 (2016-04-01)
+------------------
+
+- Fixed an integer overflow in Jpeg2KEncode.c causing a buffer overflow. CVE-2016-3076
+  [wiredfool]
+
+
+
 3.1.1 (2016-02-04)
 ------------------
 
diff --git a/PIL/__init__.py b/PIL/__init__.py
index aba128522..7c9ae42d8 100644
--- a/PIL/__init__.py
+++ b/PIL/__init__.py
@@ -12,7 +12,7 @@
 # ;-)
 
 VERSION = '1.1.7'  # PIL version
-PILLOW_VERSION = '3.1.1'  # Pillow
+PILLOW_VERSION = '3.1.2'  # Pillow
 
 _plugins = ['BmpImagePlugin',
             'BufrStubImagePlugin',
diff --git a/_imaging.c b/_imaging.c
index 9de930d95..2361f24d4 100644
--- a/_imaging.c
+++ b/_imaging.c
@@ -71,7 +71,7 @@
  * See the README file for information on usage and redistribution.
  */
 
-#define PILLOW_VERSION "3.1.1"
+#define PILLOW_VERSION "3.1.2"
 
 #include "Python.h"
 
diff --git a/appveyor.yml b/appveyor.yml
index 28b4a9a0f..ded68953e 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -1,4 +1,4 @@
-version: 3.1.1.{build}
+version: 3.1.2.{build}
 clone_folder: c:\pillow
 init:
 - ECHO %PYTHON%
diff --git a/setup.py b/setup.py
index 2f99d3b8f..0f5aaba4f 100644
--- a/setup.py
+++ b/setup.py
@@ -90,7 +90,7 @@ except (ImportError, OSError):
 
 
 NAME = 'Pillow'
-PILLOW_VERSION = '3.1.1'
+PILLOW_VERSION = '3.1.2'
 TCL_ROOT = None
 JPEG_ROOT = None
 JPEG2K_ROOT = None