diff --git a/.gitignore b/.gitignore
index 1babd6b..a61aa79 100644
--- a/.gitignore
+++ b/.gitignore
@@ -11,3 +11,4 @@
 /pypy-2.2.1-src.tar.bz2
 /pypy-2.3-src.tar.bz2
 /release-2.3.1.tar.bz2
+/pypy-2.4.0-src.tar.bz2
diff --git a/pypy.spec b/pypy.spec
index daf5015..4a3e56c 100644
--- a/pypy.spec
+++ b/pypy.spec
@@ -1,6 +1,6 @@
 Name:           pypy
-Version:        2.3.1
-Release:        4%{?dist}
+Version:        2.4.0
+Release:        1%{?dist}
 Summary:        Python implementation with a Just-In-Time compiler
 
 Group:          Development/Languages
@@ -130,7 +130,7 @@ BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
   %(echo '%{__os_install_post}' | sed -e 's!/usr/lib[^[:space:]]*/brp-python-bytecompile[[:space:]].*$!!g')
 
 # Source and patches:
-Source0: https://bitbucket.org/pypy/pypy/get/release-2.3.1.tar.bz2
+Source0: https://bitbucket.org/pypy/pypy/downloads/pypy-2.4.0-src.tar.bz2
 
 # Supply various useful RPM macros for building python modules against pypy:
 #  __pypy, pypy_sitelib, pypy_sitearch
@@ -276,7 +276,7 @@ Build of PyPy with support for micro-threads for massive concurrency
 
 
 %prep
-%setup -q -n pypy-pypy-32f35069a16d
+%setup -q -n pypy-2.4.0-src
 %patch0 -p1 -b .suppress-mandelbrot-set-during-tty-build
 %patch1 -p1
 %patch2 -p1
@@ -295,6 +295,8 @@ for f in rpython/translator/goal/bpnn.py ; do
    chmod a-x $f
 done
 
+rm -rf lib-python/3
+
 
 %build
 
@@ -832,6 +834,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Wed Sep 10 2014 Matej Stuchlik <mstuchli@redhat.com> - 2.4.0-1
+- Update to 2.4.0
+
 * Tue Sep 02 2014 Matej Stuchlik <mstuchli@redhat.com> - 2.3.1-4
 - Move devel subpackage requires so that it gets picked up by rpm
 
diff --git a/sources b/sources
index b80a17c..ab6b8f5 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-e9d26e6ed2ca809a791d88137e90629b  release-2.3.1.tar.bz2
+6a25a212e7c5121f1f3988c118d05695  pypy-2.4.0-src.tar.bz2