diff --git a/Pillow-2.4.0.zip b/Pillow-2.4.0.zip
deleted file mode 100644
index 3f5aff6..0000000
--- a/Pillow-2.4.0.zip
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:2865c68b3a5638466b1837bf4a67c447e0cfdf7463309a068aad0e90aa03f58a
-size 6519873
diff --git a/Pillow-2.5.1.zip b/Pillow-2.5.1.zip
new file mode 100644
index 0000000..dc23b8b
--- /dev/null
+++ b/Pillow-2.5.1.zip
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:f101893b44af53e4e534cf367b7e73325c09733a047e969d99029eff88e5e866
+size 6871957
diff --git a/python-Pillow.changes b/python-Pillow.changes
index 7c1aad5..8d38f9d 100644
--- a/python-Pillow.changes
+++ b/python-Pillow.changes
@@ -1,3 +1,60 @@
+-------------------------------------------------------------------
+Mon Aug 11 09:05:47 UTC 2014 - mcihar@suse.cz
+
+- enable build time testing, but not for i586 as it's broken there due to some
+  rounding error (see https://github.com/python-pillow/Pillow/issues/819)
+
+-------------------------------------------------------------------
+Mon Aug 11 08:57:55 UTC 2014 - mcihar@suse.cz
+
+- Update to 2.5.1:
+ * 2.5.1 (2014-07-10)
+    Fixed install issue if Multiprocessing.Pool is not available [wiredfool]
+    32bit mult overflow fix #782 [wiredfool]
+ * 2.5.0 (2014-07-01)
+    Imagedraw rewrite [terseus, wiredfool]
+    Add support for multithreaded test execution [wiredfool]
+    Prevent shell injection #748 [mbrown1413, wiredfool]
+    Support for Resolution in BMP files #734 [gcq]
+    Fix error in setup.py for Python 3 [matthew-brett]
+    Pyroma fix and add Python 3.4 to setup metadata #742 [wirefool]
+    Top level flake8 fixes #741 [aclark]
+    Remove obsolete Animated Raster Graphics (ARG) support [hugovk]
+    Fix test_imagedraw failures #727 [cgohlke]
+    Fix AttributeError: class Image has no attribute 'DEBUG' #726 [cgohlke]
+    Fix msvc warning: 'inline' : macro redefinition #725 [cgohlke]
+    Cleanup #654 [dvska, hugovk, wiredfool]
+    16-bit monochrome support for JPEG2000 [videan42]
+    Fixed ImagePalette.save [brightpisces]
+    Support JPEG qtables [csinchok]
+    Add binary morphology addon [dov, wiredfool]
+    Decompression bomb protection [hugovk]
+    Put images in a single directory [hugovk]
+    Support OpenJpeg 2.1 [al45tair]
+    Remove unistd.h #include for all platforms [wiredfool]
+    Use unittest for tests [hugovk]
+    ImageCms fixes [hugovk]
+    Added more ImageDraw tests [hugovk]
+    Added tests for Spider files [hugovk]
+    Use libtiff to write any compressed tiff files [wiredfool]
+    Support for pickling Image objects [hugovk]
+    Fixed resolution handling for EPS thumbnails [eliempje]
+    Fixed rendering of some binary EPS files (Issue #302) [eliempje]
+    Rename variables not to use built-in function names [hugovk]
+    Ignore junk JPEG markers [hugovk]
+    Change default interpolation for Image.thumbnail to Image.ANTIALIAS [hugovk]
+    Add tests and fixes for saving PDFs [hugovk]
+    Remove transparency resource after P->RGBA conversion [hugovk]
+    Clean up preprocessor cruft for Windows [CounterPillow]
+    Adjust Homebrew freetype detection logic [jacknagel]
+    Added Image.close, context manager support. [wiredfool]
+    Added support for 16 bit PGM files. [wiredfool]
+    Updated OleFileIO to version 0.30 from upstream [hugovk]
+    Added support for additional TIFF floating point format [Hijackal]
+    Have the tempfile use a suffix with a dot [wiredfool]
+    Fix variable name used for transparency manipulations [nijel]
+- adjusted testsuite execution
+
 -------------------------------------------------------------------
 Fri Aug  1 15:40:48 CEST 2014 - tiwai@suse.de
 
diff --git a/python-Pillow.spec b/python-Pillow.spec
index 621a7bf..0f65871 100644
--- a/python-Pillow.spec
+++ b/python-Pillow.spec
@@ -17,7 +17,7 @@
 
 
 Name:           python-Pillow
-Version:        2.4.0
+Version:        2.5.1
 Release:        0
 Summary:        Python Imaging Library (Fork)
 License:        HPND
@@ -40,6 +40,7 @@ BuildRequires:  openjpeg2-devel
 %endif
 BuildRequires:  freetype2-devel
 BuildRequires:  libtiff-devel
+BuildRequires:  python-nose
 BuildRequires:  zlib-devel
 Requires(post): update-alternatives
 Requires(postun): update-alternatives
@@ -84,7 +85,7 @@ Python Imaging Library by Fredrik Lundh and Contributors.
 %setup -q -n Pillow-%{version}
 
 %build
-# no need to build it here, as setup.py install will build it again, anyway
+python setup.py build
 
 %install
 python setup.py install --prefix=%{_prefix} --root=%{buildroot}
@@ -98,8 +99,14 @@ done
 echo "PIL" > %{buildroot}%{python_sitearch}/PIL.pth
 
 %check
-python setup.py test
-python selftest.py
+PYTHONPATH=%{buildroot}/%{python_sitearch} python selftest.py --installed
+%ifnarch i586
+# Disabled as it fails on i586:
+# https://github.com/python-pillow/Pillow/issues/819
+%if 0%{?suse_version} > 1230
+PYTHONPATH=%{buildroot}/%{python_sitearch} python test-installed.py
+%endif
+%endif
 
 %post
 update-alternatives \