diff --git a/accel-config-v3.0.1.tar.gz b/accel-config-v3.0.1.tar.gz
deleted file mode 100644
index 57d179d..0000000
--- a/accel-config-v3.0.1.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:598611c96c9766356be810c2571c0b5b4547d6e91033701e6e9c596ad97b0154
-size 130568
diff --git a/accel-config-v3.1.tar.gz b/accel-config-v3.1.tar.gz
new file mode 100644
index 0000000..a7cc406
--- /dev/null
+++ b/accel-config-v3.1.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:eb1add686ca7175cd3d738747973efb43756cf61d10d2527bce6b3d25f577ef4
+size 130308
diff --git a/accel-config.changes b/accel-config.changes
index 949a5c4..ff59cad 100644
--- a/accel-config.changes
+++ b/accel-config.changes
@@ -1,3 +1,17 @@
+-------------------------------------------------------------------
+Mon Apr 26 09:57:42 UTC 2021 - Ferdinand Thiessen <rpm@fthiessen.de>
+
+- Update to version 3.1
+  * Improved error messages and return values
+  * Fix incorrect error return value from tool
+  * Allow -1 special value for wq->groupid and fix related error
+    messages
+  * Fix incorrect manpage text for config-wq
+  * Remove reference to non-interface header in interface header
+  * Remove non-interface header from packaging
+  * Use portable data types and fix build issues in 32 bit targets
+- Dropped upstream merged v3.0.1-use-portable-data-types.patch
+
 -------------------------------------------------------------------
 Fri Feb 12 13:09:35 UTC 2021 - Libor Pechacek <lpechacek@suse.com>
 
diff --git a/accel-config.spec b/accel-config.spec
index 9f1a8c0..f3caa12 100644
--- a/accel-config.spec
+++ b/accel-config.spec
@@ -19,13 +19,12 @@
 %define pkg_libname libaccel-config1
 
 Name:           accel-config
-Version:        3.0.1
+Version:        3.1
 Release:        0
 Summary:        Configure accelerator subsystem devices
 License:        GPL-2.0-only
 URL:            https://github.com/intel/idxd-config
 Source:         https://github.com/intel/idxd-config/archive/accel-config-v%{version}.tar.gz
-Patch0:         v3.0.1-use-portable-data-types.patch
 BuildRequires:  asciidoc
 BuildRequires:  autoconf
 BuildRequires:  automake
@@ -65,7 +64,6 @@ Libraries for %{name}.
 
 %prep
 %setup -q -n idxd-config-accel-config-v%{version}
-%autopatch -p1
 
 %build
 echo %{version} > version
diff --git a/v3.0.1-use-portable-data-types.patch b/v3.0.1-use-portable-data-types.patch
deleted file mode 100644
index 92a79b0..0000000
--- a/v3.0.1-use-portable-data-types.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From: Libor Pechacek <lpechacek@suse.cz>
-Date: Fri, 12 Feb 2021 13:53:45 +0100
-Subject: [PATCH] Fix compilation on 32bit platforms
-Patch-upstream: no, submitted at https://github.com/intel/idxd-config/issues/3
-
-While DSA and IAX are embedded in 64bit CPU, it's fair to assume
-that the operating system might run in 32bit mode. This patch
-makes the source code compile in 32bit environment.
----
- accfg/libaccel_config.h | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/accfg/libaccel_config.h b/accfg/libaccel_config.h
-index 0814601a9156..bed340d016ce 100644
---- a/accfg/libaccel_config.h
-+++ b/accfg/libaccel_config.h
-@@ -102,7 +102,7 @@ struct wq_parameters {
- 	unsigned int priority;
- 	int block_on_fault;
- 	unsigned int max_batch_size;
--	unsigned long max_transfer_size;
-+	uint64_t max_transfer_size;
- 	const char *mode;
- 	const char *type;
- 	const char *name;
--- 
-2.30.0
-