diff --git a/.gitignore b/.gitignore
index 079acd1..b6b3db2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -25,3 +25,4 @@
 /yubioath-desktop-4df579e.tar.gz
 /yubioath-desktop-5e94bd8.tar.gz
 /yubioath-desktop-2e13158.tar.gz
+/yubioath-desktop-9ea38f706ccba6b56d424364a1fba3351f3bdac7.tar.gz
diff --git a/sources b/sources
index 2c98330..ec1a0ae 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (yubioath-desktop-2e13158.tar.gz) = 8d0afbbdb7e2b48884fedba2ec6f4369cf5a6c4265bc3a2c3b16febb88a5beefc3e17f6a61fa28f7ec74846d6d2b92cb1701adf4a750055532149d6a38138547
+SHA512 (yubioath-desktop-9ea38f706ccba6b56d424364a1fba3351f3bdac7.tar.gz) = f8c93ffda0d74f29ac89e3cf1cf7dfd1e5fc52ac2160085a29179b49da3e11bfde5abda137bc65d09bbb9e4151148ea3f79a2a0b61658ae76da00e12099370cb
diff --git a/yubioath-desktop.rpmlintrc b/yubioath-desktop.rpmlintrc
index ea84abe..d6a1c08 100644
--- a/yubioath-desktop.rpmlintrc
+++ b/yubioath-desktop.rpmlintrc
@@ -1,3 +1,4 @@
 # SPELLING ERRORS
 addFilter(r" spelling-error .* (Yubikey)")
 addFilter(r" no-manual-page-for-binary yubioath-desktop")
+addFilter(r" incoherent-version-in-change-log")
diff --git a/yubioath-desktop.spec b/yubioath-desktop.spec
index 85432e4..8e60772 100644
--- a/yubioath-desktop.spec
+++ b/yubioath-desktop.spec
@@ -1,25 +1,24 @@
-%global commit 2e13158bf88b57bea3d3cd6c3c47680e84417a57
-%global shortcommit %(c=%{commit}; echo ${c:0:7})
-%global owner Yubico
-%global svn git
+%global commit 9ea38f706ccba6b56d424364a1fba3351f3bdac7
+%global forgeurl https://github.com/Yubico/yubioath-desktop/
 
-Name:		yubioath-desktop
-Version:	5.0.4
-Release:	6.%{svn}%{shortcommit}%{?dist}
-Summary:	Yubikey tool for generating OATH event-based HOTP and time-based TOTP codes
+Name:       yubioath-desktop
+Version:    5.0.4
 
-License:	BSD
-URL:		https://github.com/%{owner}/yubioath-desktop
-Source0:	https://github.com/%{owner}/%{name}/archive/%{commit}.tar.gz#/%{name}-%{shortcommit}.tar.gz
-Source1:	%{name}.rpmlintrc
+%forgemeta
 
-BuildRequires: make
-BuildRequires:		qt5-qtbase-devel qt5-qtdeclarative-devel qt5-qtsvg-devel gcc-c++ 
-BuildRequires:		python3 desktop-file-utils qt5-qtquickcontrols2-devel
-Requires:		pyotherside qt5-qtdeclarative qt5-qtquickcontrols pcsc-lite-ccid yubikey-manager
+Release:    7%{?dist}
+Summary:    Yubikey tool for generating OATH event-based HOTP and time-based TOTP codes
+
+License:    BSD
+URL:        %{forgeurl}
+Source0:    %{forgesource}
+Source1:    %{name}.rpmlintrc
 
-## uses Qt5 private api's these help track that
-BuildRequires:		qt5-qtbase-private-devel
+BuildRequires: make
+BuildRequires: qt5-qtbase-devel qt5-qtdeclarative-devel qt5-qtsvg-devel gcc-c++
+BuildRequires: python3 desktop-file-utils qt5-qtquickcontrols2-devel
+BuildRequires: qt5-qtbase-private-devel
+Requires:      pyotherside qt5-qtdeclarative qt5-qtquickcontrols pcsc-lite-ccid
 
 %description
 The Yubico Authenticator is a graphical desktop tool and CLI for generating
@@ -27,7 +26,8 @@ Open AuTHentication (OATH) event-based HOTP and time-based TOTP one-time
 password codes, with the help of a YubiKey that protects the shared secrets.
 
 %prep
-%autosetup -n %{name}-%{commit}
+%forgesetup
+%autosetup -n %{archivename}
 sed -i -e "s/python /python3 /" %{name}.pro
 sed -i -e "1s|^#.*$|#!%{__python3}|g" build_qrc.py py/yubikey.py
 
@@ -52,6 +52,9 @@ install -Dpm0644 -t %{buildroot}%{_datadir}/icons/hicolor/128x128/apps resources
 %{_datadir}/applications/*
 
 %changelog
+* Tue Feb 09 2021 Gerald Cox <gbcox@fedoraproject.org> - 5.0.4-7.20210209git9ea38f7
+- Patch for yubikey-manager 4.0 rhbz#1925637
+
 * Thu Jan 28 2021 Fedora Release Engineering <releng@fedoraproject.org> - 5.0.4-6.git2e13158
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild