diff --git a/.accel-config.metadata b/.accel-config.metadata
index ec4daba..d539016 100644
--- a/.accel-config.metadata
+++ b/.accel-config.metadata
@@ -1 +1 @@
-21e70c79f2e53c5cdbc941390f14b020f286a36d SOURCES/accel-config-v3.4.6.3.tar.gz
+c2571f89e855e1054a078a4dfee1d7d6feefb7e5 SOURCES/accel-config-v3.5.0.tar.gz
diff --git a/.gitignore b/.gitignore
index 8cac709..7b5083c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-SOURCES/accel-config-v3.4.6.3.tar.gz
+SOURCES/accel-config-v3.5.0.tar.gz
diff --git a/SOURCES/0001-testing-vercheck.patch b/SOURCES/0001-testing-vercheck.patch
index 586d43e..8ad2812 100644
--- a/SOURCES/0001-testing-vercheck.patch
+++ b/SOURCES/0001-testing-vercheck.patch
@@ -1,6 +1,6 @@
-diff -ur idxd-config-accel-config-v3.4.6.2/test/dsa_user_test_runner.sh idxd-config-accel-config-v3.4.6.2-new/test/dsa_user_test_runner.sh
---- idxd-config-accel-config-v3.4.6.2/test/dsa_user_test_runner.sh 2022-03-22 16:13:44.000000000 -0700
-+++ idxd-config-accel-config-v3.4.6.2-new/test/dsa_user_test_runner.sh 2022-04-04 22:36:15.080120329 -0700
+diff --color -ur idxd-config-accel-config-v3.4.8/test/dsa_user_test_runner.sh idxd-config-accel-config-v3.4.8-new/test/dsa_user_test_runner.sh
+--- idxd-config-accel-config-v3.4.8/test/dsa_user_test_runner.sh 2022-09-21 14:16:06.000000000 -0700
++++ idxd-config-accel-config-v3.4.8-new/test/dsa_user_test_runner.sh 2022-10-06 16:36:02.838178412 -0700
@@ -14,7 +14,7 @@
[ ! -f "$DSATEST" ] && echo "fail: $LINENO" && exit 1
@@ -10,9 +10,21 @@ diff -ur idxd-config-accel-config-v3.4.6.2/test/dsa_user_test_runner.sh idxd-con
# skip if no pasid support as dsa_test does not support operation w/o pasid yet.
[ ! -f "/sys/bus/dsa/devices/$DSA/pasid_enabled" ] && echo "No SVM support" && exit "$EXIT_SKIP"
-diff -ur idxd-config-accel-config-v3.4.6.2/test/libaccfg.c idxd-config-accel-config-v3.4.6.2-new/test/libaccfg.c
---- idxd-config-accel-config-v3.4.6.2/test/libaccfg.c 2022-03-22 16:13:44.000000000 -0700
-+++ idxd-config-accel-config-v3.4.6.2-new/test/libaccfg.c 2022-04-04 22:36:26.861224525 -0700
+diff --color -ur idxd-config-accel-config-v3.4.8/test/iaa_user_test_runner.sh idxd-config-accel-config-v3.4.8-new/test/iaa_user_test_runner.sh
+--- idxd-config-accel-config-v3.4.8/test/iaa_user_test_runner.sh 2022-09-21 14:16:06.000000000 -0700
++++ idxd-config-accel-config-v3.4.8-new/test/iaa_user_test_runner.sh 2022-10-06 16:35:43.989998045 -0700
+@@ -14,7 +14,7 @@
+
+ [ ! -f "$IAATEST" ] && echo "fail: $LINENO" && exit 1
+
+-check_min_kver "5.6" || do_skip "kernel does not support idxd"
++check_min_kver "4.18" || do_skip "kernel does not support idxd"
+
+ # skip if no pasid support as iaa_test does not support operation w/o pasid yet.
+ [ ! -f "/sys/bus/dsa/devices/$IAA/pasid_enabled" ] && echo "No SVM support" && exit "$EXIT_SKIP"
+diff --color -ur idxd-config-accel-config-v3.4.8/test/libaccfg.c idxd-config-accel-config-v3.4.8-new/test/libaccfg.c
+--- idxd-config-accel-config-v3.4.8/test/libaccfg.c 2022-09-21 14:16:06.000000000 -0700
++++ idxd-config-accel-config-v3.4.8-new/test/libaccfg.c 2022-10-06 16:36:31.090448787 -0700
@@ -966,7 +966,7 @@
struct accfg_device *device;
struct log_ctx log_ctx;
diff --git a/SPECS/accel-config.spec b/SPECS/accel-config.spec
index 9f506f5..aa4ebe8 100644
--- a/SPECS/accel-config.spec
+++ b/SPECS/accel-config.spec
@@ -1,7 +1,7 @@
%global project_name idxd-config
Name: accel-config
-Version: 3.4.6.3
+Version: 3.5.0
Release: 1%{?dist}
Summary: Configure accelerator subsystem devices
# The entire source code is under GPLv2 except for accel-config
@@ -24,6 +24,7 @@ BuildRequires: pkgconfig(libkmod)
BuildRequires: pkgconfig(uuid)
BuildRequires: pkgconfig(json-c)
BuildRequires: pkgconfig(libudev)
+BuildRequires: pkgconfig(zlib)
BuildRequires: systemd
# accel-config is for configuring Intel DSA (Data-Streaming
@@ -82,8 +83,7 @@ make check
%license licenses/accel-config-licenses LICENSE_GPL_2_0
%{_bindir}/%{name}
%{_mandir}/man1/%{name}*
-%{_sysconfdir}/%{name}/%{name}.conf.sample
-%{_datadir}/%{name}/contrib/*
+%{_sysconfdir}/%{name}/contrib/configs/*
%files libs
%doc README.md
@@ -100,9 +100,17 @@ make check
%files test
%license Documentation/COPYING LICENSE_GPL_2_0
#%doc test/README.md
-%{_datadir}/%{name}/test/*
+%{_prefix}/lib/accel-config/test/*
%changelog
+* Sun Oct 16 2022 Jerry Snitselaar <jsnitsel@redhat.com> - 3.5.0-1
+- Rebase to the 3.5.0 release.
+resolves: rhbz#2101608
+
+* Thu Oct 06 2022 Jerry Snitselaar <jsnitsel@redhat.com> - 3.4.8-1
+- Rebase to 3.4.8 release.
+resolves: rhbz#2101608
+
* Sun Apr 03 2022 Jerry Snitselaar <jsnitsel@redhat.com> - 3.4.6.3-1
- Rebase to 3.4.6.3 release.
resolves: rhbz#2040076