diff --git a/CHANGES.rst b/CHANGES.rst
index 58274b1fe..2c09c284b 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -4,6 +4,9 @@ Changelog (Pillow)
 2.2.0 (2013-10-01)
 ------------------
 
+- Fix for #318: Catch truncated zTXt errors.
+  [vytisb]
+
 - Fix IOError when saving progressive JPEGs.
   [e98cuenc]
 
diff --git a/setup.py b/setup.py
index ddaee9a3e..91d9f6fba 100644
--- a/setup.py
+++ b/setup.py
@@ -567,6 +567,7 @@ setup(
         "Programming Language :: Python :: 3.3", ],
     cmdclass={"build_ext": pil_build_ext},
     ext_modules=[Extension("PIL._imaging", ["_imaging.c"])],
+    include_package_data=True,
     packages=find_packages(),
     scripts=glob.glob("Scripts/pil*.py"),
     keywords=["Imaging",],