diff --git a/Pillow-2.3.0.zip b/Pillow-2.3.0.zip
deleted file mode 100644
index 6ca4d58..0000000
--- a/Pillow-2.3.0.zip
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:b38e7e32401ae2d949cb4b82c6388cd13e697d1e2f8a1bffce3b834d00fbca13
-size 2421241
diff --git a/Pillow-2.4.0.zip b/Pillow-2.4.0.zip
new file mode 100644
index 0000000..3f5aff6
--- /dev/null
+++ b/Pillow-2.4.0.zip
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:2865c68b3a5638466b1837bf4a67c447e0cfdf7463309a068aad0e90aa03f58a
+size 6519873
diff --git a/python-Pillow.changes b/python-Pillow.changes
index abb3b13..71826e7 100644
--- a/python-Pillow.changes
+++ b/python-Pillow.changes
@@ -1,8 +1,27 @@
+-------------------------------------------------------------------
+Thu May  8 14:22:57 UTC 2014 - hpj@urpla.net
+
+- New upstream release 2.4.0. For details see
+  https://pypi.python.org/pypi/Pillow/2.4.0
+- New dependency: openjpeg2 for JPEG 2000 support
+
+-------------------------------------------------------------------
+Sun Apr 27 21:30:58 UTC 2014 - hpj@urpla.net
+
+- provide python-imaging in order to act as a drop in replacement
+  for it.
+
 -------------------------------------------------------------------
 Fri Feb 14 07:28:32 UTC 2014 - mcihar@suse.cz
 
 - Fix build for older distributions which do not include lcms2
 
+-------------------------------------------------------------------
+Tue Feb  4 10:53:08 UTC 2014 - hpj@urpla.net
+
+- symlink alternatives files, as requested from Coolo, in order to
+  get rid of suse version conditional
+
 -------------------------------------------------------------------
 Fri Jan 17 21:59:13 UTC 2014 - hpj@urpla.net
 
diff --git a/python-Pillow.spec b/python-Pillow.spec
index 6f7a483..05e674f 100644
--- a/python-Pillow.spec
+++ b/python-Pillow.spec
@@ -17,7 +17,7 @@
 
 
 Name:           python-Pillow
-Version:        2.3.0
+Version:        2.4.0
 Release:        0
 Summary:        Python Imaging Library (Fork)
 License:        HPND
@@ -34,6 +34,7 @@ BuildRequires:  unzip
 BuildRequires:  libjpeg8-devel
 BuildRequires:  liblcms2-devel
 BuildRequires:  libwebp-devel
+BuildRequires:  openjpeg2-devel
 %endif
 BuildRequires:  freetype2-devel
 BuildRequires:  libtiff-devel
@@ -48,7 +49,11 @@ BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 Conflicts:      python-imaging
 # NOTE(saschpe): python-imaging should have never provided this and I'm a bit relucatant do it either.
 # http://en.opensuse.org/openSUSE:Upgrade_dependencies_explanation#Replace_a_package_by_another_with_the_same_functionality
+# ALSO NOTE (frispete): without providing python-imaging, all packages requiring it will break
+Provides:       python-imaging
+
 Obsoletes:      python-imaging-sane
+Provides:       python-imaging-sane
 
 %description
 Pillow is the "friendly" PIL fork by Alex Clark and Contributors. PIL is the
@@ -76,13 +81,15 @@ Python Imaging Library by Fredrik Lundh and Contributors.
 %setup -q -n Pillow-%{version}
 
 %build
-CFLAGS="%{optflags}" python setup.py build
+# no need to build it here, as setup.py install will build it again, anyway
 
 %install
 python setup.py install --prefix=%{_prefix} --root=%{buildroot}
+mkdir -p %{buildroot}%{_sysconfdir}/alternatives
 for p in pilconvert pildriver pilfile pilfont pilprint ; do
   mv %{buildroot}%{_bindir}/$p.py %{buildroot}%{_bindir}/$p-%{py_ver}
   ln -s %{_bindir}/$p-%{py_ver} %{buildroot}%{_bindir}/$p
+  ln -s %{_bindir}/$p-%{py_ver} %{buildroot}%{_sysconfdir}/alternatives/$p
 done
 
 %check
@@ -119,13 +126,11 @@ fi
 %{python_sitearch}/Pillow-%{version}-py%{py_ver}.egg-info
 %exclude %{python_sitearch}/PIL/ImageTk*
 %exclude %{python_sitearch}/PIL/_imagingtk*
-%if 0%{?suse_version} > 1220
 %ghost %{_sysconfdir}/alternatives/pilconvert
 %ghost %{_sysconfdir}/alternatives/pildriver
 %ghost %{_sysconfdir}/alternatives/pilfile
 %ghost %{_sysconfdir}/alternatives/pilfont
 %ghost %{_sysconfdir}/alternatives/pilprint
-%endif
 
 %files tk
 %defattr(-,root,root,-)