diff --git a/.gitignore b/.gitignore
index c5be346..bf8b39b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,3 +8,5 @@
 /dpdk-19.11.3.tar.xz
 /dpdk-20.11.tar.xz
 /dpdk-20.11.1.tar.xz
+/dpdk-21.11.tar.xz
+/pyelftools-0.27.tar.gz
diff --git a/dpdk.spec b/dpdk.spec
index e1d3890..fb12fbc 100644
--- a/dpdk.spec
+++ b/dpdk.spec
@@ -13,9 +13,14 @@
 
 %define srcname dpdk
 
+%define pyelftoolsver 0.27
+
 Name: dpdk
 Version: %{ver}
 Release: %{rel}%{?commit0:.%{date}git%{shortcommit0}}%{?dist}
+%if 0%{?fedora} || 0%{?rhel} > 8
+Epoch: 2
+%endif
 URL: http://dpdk.org
 %if 0%{?commit0:1}
 Source: http://dpdk.org/browse/dpdk/snapshot/dpdk-%{commit0}.tar.xz
@@ -56,10 +61,8 @@ Conflicts: dpdk-doc < 18.11-2
 %endif
 
 BuildRequires: meson
-%if 0%{?rhel} && 0%{?rhel} < 9
-%define pyelftoolsver 0.27
-Source1: https://github.com/eliben/pyelftools/archive/refs/tags/v%{pyelftoolsver}.tar.gz
-%else
+Source1: https://github.com/eliben/pyelftools/archive/refs/tags/v%{pyelftoolsver}.tar.gz#/pyelftools-%{pyelftoolsver}.tar.gz
+%if 0%{?rhel} > 8 || 0%{?fedora}
 BuildRequires: python3-pyelftools
 %endif
 BuildRequires: gcc, zlib-devel, numactl-devel
@@ -74,7 +77,7 @@ fast packet processing in the user space.
 
 %package devel
 Summary: Data Plane Development Kit development files
-Requires: %{name}%{?_isa} = %{version}-%{release}
+Requires: %{name}%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release}
 %ifarch x86_64
 Requires: rdma-core-devel
 %endif
@@ -93,7 +96,7 @@ API programming documentation for the Data Plane Development Kit.
 %if %{with tools}
 %package tools
 Summary: Tools for setting up Data Plane Development Kit environment
-Requires: %{name} = %{version}-%{release}
+Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release}
 Requires: kmod pciutils findutils iproute python3
 
 %description tools
diff --git a/sources b/sources
index 2af838f..db0ab72 100644
--- a/sources
+++ b/sources
@@ -1 +1,2 @@
 SHA512 (dpdk-21.11.tar.xz) = 843282023c2f77a9b8af393d50c6dde54f09d490cd6f4a99f03d4df5df13a7d963aa86885fdf64e13f9da71e01c881d1f301dd093574a32cddd84f4b1fb58fd5
+SHA512 (pyelftools-0.27.tar.gz) = bb0a00e5500016e3d4f64be0a728e190f84b11a805f78d668b5a74716a30400e6794946f198ef4a3f3b8f64a63deb1b5a96180b09e56b7357b988b28e25fad0a