diff --git a/.gitignore b/.gitignore
index 1fb3d44..f8e97c1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,3 +4,4 @@
 /rr-cf5169b.tar.gz
 /rr-bab9ca9.tar.gz
 /rr-b53e4d9.tar.gz
+/rr-5.4.0.tar.gz
diff --git a/rr.spec b/rr.spec
index 0036584..75250eb 100644
--- a/rr.spec
+++ b/rr.spec
@@ -1,9 +1,10 @@
 # Force out of source build
 %undefine __cmake_in_source_build
 
-%global commit b53e4d990b873e1b57284994ad7a65f3626880f5
+%global commit c2878731db4ed3d16ee999fa74fe2a5fb7edb0e6
+%global gittag 5.4.0
 %global shortcommit %(c=%{commit}; echo ${c:0:7})
-%global baserelease 19
+%global baserelease 1
 
 ExclusiveArch:  %{ix86} x86_64
 
@@ -14,8 +15,8 @@ ExclusiveArch:  %{ix86} x86_64
 %endif
 Summary:        Tool to record and replay execution of applications
 Name:           rr
-Version:        5.3.0
-Release:        %{baserelease}.20200828git%{shortcommit}%{?dist}
+Version:        5.4.0
+Release:        %{baserelease}%{?dist}
 # The entire source code is MIT with the exceptions of
 # files in following directories:
 #   third-party/blake2       CC0
@@ -24,7 +25,7 @@ Release:        %{baserelease}.20200828git%{shortcommit}%{?dist}
 License:        MIT and CC0 and BSD
 URL:            http://rr-project.org
  
-Source: https://github.com/mozilla/rr/archive/%{commit}/%{name}-%{shortcommit}.tar.gz
+Source: https://github.com/mozilla/rr/archive/%{gittag}/%{name}-%{version}.tar.gz
 
 %if  0%{?rhel} == 7
 BuildRequires: cmake3
@@ -64,7 +65,7 @@ rr-testsuite includes compiled test binaries and other files
 which are used to test the functionality of rr.
  
 %prep
-%setup -q -n rr-%{commit}
+%setup -q -n rr-%{gittag}
 
 %build
 %if  0%{?rhel} == 7
@@ -122,6 +123,9 @@ patchelf --set-rpath '%{_libdir}/rr/' %{buildroot}%{_libdir}/rr/testsuite/obj/bi
 %license LICENSE
 
 %changelog
+* Mon Nov 2 2020 William Cohen <wcohen@redhat.com> - 5.4.0-1
+- Rebase to rr-5.4.0.
+
 * Fri Aug 28 2020 Sagar Patel <sapatel@redhat.com> - 5.3.0-19.20200828gitb53e4d9
 - Sync with upstream branch master,
   commit b53e4d990b873e1b57284994ad7a65f3626880f5.
diff --git a/sources b/sources
index 4805555..5c5095f 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (rr-b53e4d9.tar.gz) = 88fafe0333d756e6d5af95c34143aa8b9a4cbfb6acdcc3aa63aa9dfbe4c36b7b3cd693f812710d2067923a88bb314fa018538c73b0c5c2f94b5a92f3d11945eb
+SHA512 (rr-5.4.0.tar.gz) = 69b029a29cf3c147f033ff4c1c67c6190f5163b4f7329306e5f0ccfe78cae4b6ae262602253772e83d5a55408c5a4d121e5a9b3530779de74adc34b81e2592c8