diff --git a/.gitignore b/.gitignore
index a2c0ce3..a76a595 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 /pypy-*-src.tar.bz2
+/pypy2-v5.4.0-src.tar.bz2
diff --git a/007-remove-startup-message.patch b/007-remove-startup-message.patch
index 2ff9068..21e8b15 100644
--- a/007-remove-startup-message.patch
+++ b/007-remove-startup-message.patch
@@ -5,8 +5,8 @@ diff -rup pypy-pypy-f66246c46ca3/lib_pypy/_pypy_interact.py pypy-pypy-f66246c46c
  irc_header = "And now for something completely different"
  
  
--def interactive_console(mainmodule=None, quiet=False):
-+def interactive_console(mainmodule=None, quiet=True):
+-def interactive_console(mainmodule=None, quiet=False, future_flags=0):
++def interactive_console(mainmodule=None, quiet=True, future_flags=0):
      # set sys.{ps1,ps2} just before invoking the interactive interpreter. This
      # mimics what CPython does in pythonrun.c
      if not hasattr(sys, 'ps1'):
diff --git a/pypy-1.2-suppress-mandelbrot-set-during-tty-build.patch b/pypy-1.2-suppress-mandelbrot-set-during-tty-build.patch
deleted file mode 100644
index c97eaf3..0000000
--- a/pypy-1.2-suppress-mandelbrot-set-during-tty-build.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -rup pypy-pypy-f66246c46ca3/rpython/tool/ansi_print.py pypy-pypy-f66246c46ca3/rpython/tool/ansi_print.py
---- pypy-pypy-f66246c46ca3/rpython/tool/ansi_print.py	2013-05-27 10:35:37.648237156 +0200
-+++ pypy-pypy-f66246c46ca3/rpython/tool/ansi_print.py	2013-05-28 10:15:58.200426205 +0200
-@@ -25,7 +25,7 @@ class AnsiLog:
-         self.kw_to_color = self.KW_TO_COLOR.copy()
-         self.kw_to_color.update(kw_to_color)
-         self.file = file
--        self.fancy = True
-+        self.fancy = False
-         self.isatty = getattr(sys.stderr, 'isatty', lambda: False)
-         if self.fancy and self.isatty(): 
-             self.mandelbrot_driver = Driver()
diff --git a/pypy.spec b/pypy.spec
index 116373a..dfde5e4 100644
--- a/pypy.spec
+++ b/pypy.spec
@@ -1,6 +1,6 @@
 Name:           pypy
-Version:        5.0.1
-Release:        5%{?dist}
+Version:        5.4.0
+Release:        1%{?dist}
 Summary:        Python implementation with a Just-In-Time compiler
 
 Group:          Development/Languages
@@ -93,6 +93,8 @@ ExcludeArch: aarch64 s390 s390x
 # it on the other archs.  The resulting binary will typically be slower than
 # CPython for the latter case.
 
+%global src_name %{name}2-v%{version}-src
+
 %ifarch %{ix86} x86_64 %{arm} %{power64}
 %global with_jit 1
 %else
@@ -133,35 +135,29 @@ ExcludeArch: aarch64 s390 s390x
   %(echo '%{__os_install_post}' | sed -e 's!/usr/lib[^[:space:]]*/brp-python-bytecompile[[:space:]].*$!!g')
 
 # Source and patches:
-Source0: https://bitbucket.org/pypy/pypy/downloads/%{name}-%{version}-src.tar.bz2
+Source0: https://bitbucket.org/pypy/pypy/downloads/%{src_name}.tar.bz2
 
 # Supply various useful RPM macros for building python modules against pypy:
 #  __pypy, pypy_sitelib, pypy_sitearch
 Source2: macros.%{name}
 
-# By default, if built at a tty, the translation process renders a Mandelbrot
-# set to indicate progress.
-# This obscures useful messages, and may waste CPU cycles, so suppress it, and
-# merely render dots:
-Patch0: pypy-1.2-suppress-mandelbrot-set-during-tty-build.patch
-
 # Patch pypy.translator.platform so that stdout from "make" etc gets logged,
 # rather than just stderr, so that the command-line invocations of the compiler
 # and linker are captured:
-Patch1: 006-always-log-stdout.patch
+Patch0: 006-always-log-stdout.patch
 
 # Disable the printing of a quote from IRC on startup (these are stored in
 # ROT13 form in lib_pypy/_pypy_irc_topic.py).  Some are cute, but some could
 # cause confusion for end-users (and many are in-jokes within the PyPy
 # community that won't make sense outside of it).  [Sorry to be a killjoy]
-Patch2: 007-remove-startup-message.patch
+Patch1: 007-remove-startup-message.patch
 
 # CVE-2016-0772 python: smtplib StartTLS stripping attack
 # rhbz#1303647: https://bugzilla.redhat.com/show_bug.cgi?id=1303647
 # rhbz#1351679: https://bugzilla.redhat.com/show_bug.cgi?id=1351679
 # FIXED UPSTREAM: https://hg.python.org/cpython/rev/b3ce713fb9be
 # Raise an error when STARTTLS fails
-Patch3: 009-raise-an-error-when-STARTTLS-fails.patch
+Patch2: 009-raise-an-error-when-STARTTLS-fails.patch
 
 # Build-time requirements:
 
@@ -275,11 +271,7 @@ Build of PyPy with support for micro-threads for massive concurrency
 
 
 %prep
-%setup -n %{name}-%{version}-src
-%patch0 -p1
-%patch1 -p1
-%patch2 -p1
-%patch3 -p1
+%autosetup -p1 -n %{src_name}
 # Replace /usr/local/bin/python shebangs with /usr/bin/python:
 find -name "*.py" -exec \
   sed \
@@ -710,7 +702,7 @@ CheckPyPy %{name}-c-stackless
 %files devel
 %dir %{pypy_include_dir}
 %{pypy_include_dir}/*.h
-%{pypy_include_dir}/numpy
+%{pypy_include_dir}/_numpypy
 %{_rpmconfigdir}/macros.d/macros.%{name}
 
 %if 0%{with_stackless}
@@ -722,6 +714,9 @@ CheckPyPy %{name}-c-stackless
 
 
 %changelog
+* Thu Sep 01 2016 Michal Cyprian <mcyprian@redhat.com> - 5.4.0-1
+- Update to 5.4.0
+
 * Sun Aug 14 2016 Peter Robinson <pbrobinson@fedoraproject.org> 5.0.1-5
 - Update supported architectures list
 
diff --git a/sources b/sources
index 110a802..9b5acf5 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-798c6e83536a5fa5ed7d6efb4d06db1a  pypy-5.0.1-src.tar.bz2
+c806bea7ecbb999fffeea3a06e6462e8  pypy2-v5.4.0-src.tar.bz2