From 2d634d3019472ce09fb0aadbb4ec4d20fd8d7d47 Mon Sep 17 00:00:00 2001
From: wiredfool <eric-github@soroos.net>
Date: Tue, 12 Aug 2014 12:40:15 -0700
Subject: [PATCH] Bump Version/Changelog

---
 CHANGES.rst     | 9 +++++++++
 PIL/__init__.py | 2 +-
 _imaging.c      | 2 +-
 setup.py        | 2 +-
 4 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/CHANGES.rst b/CHANGES.rst
index 141d5c715..47df8c176 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -4,6 +4,9 @@ Changelog (Pillow)
 2.6.0 (unreleased)
 ------------------
 
+- Fixed CVE-2014-3598, a DOS in the Jpeg2KImagePlugin (backport)
+  [Andrew Drake]
+
 - Fixed CVE-2014-3589, a DOS in the IcnsImagePlugin
   [Andrew Drake]
 
@@ -61,6 +64,12 @@ Changelog (Pillow)
 - Test PalmImagePlugin and method to skip known bad tests #776
   [hugovk, wiredfool]
 
+2.5.3 (2014-08-18)
+------------------
+
+- Fixed CVE-2014-3598, a DOS in the Jpeg2KImagePlugin (backport)
+  [Andrew Drake]
+
 
 2.5.2 (2014-08-13)
 ------------------
diff --git a/PIL/__init__.py b/PIL/__init__.py
index 56edaf247..7b4b8abfa 100644
--- a/PIL/__init__.py
+++ b/PIL/__init__.py
@@ -12,7 +12,7 @@
 # ;-)
 
 VERSION = '1.1.7'  # PIL version
-PILLOW_VERSION = '2.5.0' # Pillow
+PILLOW_VERSION = '2.5.3' # Pillow
 
 _plugins = ['BmpImagePlugin',
             'BufrStubImagePlugin',
diff --git a/_imaging.c b/_imaging.c
index c28bd4d93..ec8205dd4 100644
--- a/_imaging.c
+++ b/_imaging.c
@@ -71,7 +71,7 @@
  * See the README file for information on usage and redistribution.
  */
 
-#define PILLOW_VERSION "2.5.0"
+#define PILLOW_VERSION "2.5.3"
 
 #include "Python.h"
 
diff --git a/setup.py b/setup.py
index ac3bc3ea8..5cf0e5e65 100644
--- a/setup.py
+++ b/setup.py
@@ -90,7 +90,7 @@ except (ImportError, OSError):
 
 
 NAME = 'Pillow'
-PILLOW_VERSION = '2.5.0'
+PILLOW_VERSION = '2.5.3'
 TCL_ROOT = None
 JPEG_ROOT = None
 JPEG2K_ROOT = None