diff --git a/.accel-config.metadata b/.accel-config.metadata
index 7a0db26..3176c16 100644
--- a/.accel-config.metadata
+++ b/.accel-config.metadata
@@ -1 +1 @@
-b13c1239eafdca1ce46250cf1fe0880c0177b078 SOURCES/accel-config-v2.8.tar.gz
+473693e27ca430ea231315da428ba343e1cd5efa SOURCES/accel-config-v3.1.tar.gz
diff --git a/.gitignore b/.gitignore
index 326da78..bec8d9e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-SOURCES/accel-config-v2.8.tar.gz
+SOURCES/accel-config-v3.1.tar.gz
diff --git a/SOURCES/01-accel-config-2.8-test-fix.patch b/SOURCES/01-accel-config-2.8-test-fix.patch
deleted file mode 100644
index 458aea2..0000000
--- a/SOURCES/01-accel-config-2.8-test-fix.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-Common subdirectories: idxd-config-accel-config-v2.8/accfg and idxd-config-accel-config-v2.8-new/accfg
-Common subdirectories: idxd-config-accel-config-v2.8/ccan and idxd-config-accel-config-v2.8-new/ccan
-Common subdirectories: idxd-config-accel-config-v2.8/contrib and idxd-config-accel-config-v2.8-new/contrib
-Common subdirectories: idxd-config-accel-config-v2.8/Documentation and idxd-config-accel-config-v2.8-new/Documentation
-Common subdirectories: idxd-config-accel-config-v2.8/licenses and idxd-config-accel-config-v2.8-new/licenses
-diff -u idxd-config-accel-config-v2.8/Makefile.am idxd-config-accel-config-v2.8-new/Makefile.am
---- idxd-config-accel-config-v2.8/Makefile.am	2020-09-18 10:24:01.000000000 -0700
-+++ idxd-config-accel-config-v2.8-new/Makefile.am	2021-01-19 10:12:19.243429399 -0700
-@@ -5,7 +5,9 @@
- if ENABLE_DOCS
- SUBDIRS += Documentation/accfg
- endif
-+if ENABLE_TEST
- SUBDIRS += test
-+endif
- 
- BUILT_SOURCES = version.m4
- version.m4: FORCE
-Common subdirectories: idxd-config-accel-config-v2.8/sles and idxd-config-accel-config-v2.8-new/sles
-Common subdirectories: idxd-config-accel-config-v2.8/test and idxd-config-accel-config-v2.8-new/test
-Common subdirectories: idxd-config-accel-config-v2.8/util and idxd-config-accel-config-v2.8-new/util
diff --git a/SPECS/accel-config.spec b/SPECS/accel-config.spec
index 42cec0f..1e223f4 100644
--- a/SPECS/accel-config.spec
+++ b/SPECS/accel-config.spec
@@ -1,7 +1,7 @@
 %global	project_name	idxd-config
 
 Name:		accel-config
-Version:	2.8
+Version:	3.1
 Release:	1%{?dist}
 Summary:	Configure accelerator subsystem devices
 # The entire source code is under GPLv2 except for accel-config
@@ -10,7 +10,6 @@ Summary:	Configure accelerator subsystem devices
 License:	GPLv2 and LGPLv2 and MIT and CC0
 URL:		https://github.com/intel/%{project_name}
 Source0:	%{URL}/archive/%{name}-v%{version}.tar.gz
-Patch0:         01-accel-config-2.8-test-fix.patch
 
 Requires:	%{name}-libs%{?_isa} = %{version}-%{release}
 BuildRequires:	gcc
@@ -87,5 +86,9 @@ make check
 %{_libdir}/pkgconfig/lib%{name}.pc
 
 %changelog
+* Tue May 18 2021 Jerry Snitselaar <jsnitsel@redhat.com> - 3.1-1
+- Rebase to 3.1 release.
+resolves: rhbz#1920762
+
 * Fri Nov 6 2020 Yunying Sun <yunying.sun@intel.com> - 2.8-1
 - Initial Packaging