diff --git a/fix-64bit-only-plugins.patch b/fix-64bit-only-plugins.patch
new file mode 100644
index 0000000..5b9bb5d
--- /dev/null
+++ b/fix-64bit-only-plugins.patch
@@ -0,0 +1,13 @@
+diff -Nur mumble-src/plugins/CMakeLists.txt new/plugins/CMakeLists.txt
+--- mumble-src/plugins/CMakeLists.txt	2022-08-21 18:52:23.000000000 +0200
++++ new/plugins/CMakeLists.txt	2022-09-01 12:24:10.507433751 +0200
+@@ -24,6 +24,9 @@
+ 
+ foreach(ITEM ${ITEMS})
+ 	if(IS_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/${ITEM}")
++		if (ITEM STREQUAL "gtav" AND CMAKE_SIZEOF_VOID_P LESS 8)
++			continue()
++		endif() 
+ 		set(PLUGIN_RETRACTED OFF)
+ 
+ 		# If the plugin is retracted the corresponding CMakeLists.txt is supposed to set the
diff --git a/mumble.changes b/mumble.changes
index df99da2..27809b3 100644
--- a/mumble.changes
+++ b/mumble.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Thu Sep  1 09:11:05 UTC 2022 - Ferdinand Thiessen <rpm@fthiessen.de>
+
+- Add fix-64bit-only-plugins.patch to fix build on i586
+
 -------------------------------------------------------------------
 Sun Aug 21 21:03:15 UTC 2022 - Enrico Belleri <idesmi@protonmail.com>
 
diff --git a/mumble.spec b/mumble.spec
index a546e43..439cb50 100644
--- a/mumble.spec
+++ b/mumble.spec
@@ -43,6 +43,8 @@ Source3:        murmur.apparmor
 Source4:        https://raw.githubusercontent.com/mumble-voip/mumble-gpg-signatures/master/mumble-auto-build-2022.asc#/%{name}.keyring
 Source5:        mumble-server.service
 Source6:        baselibs.conf
+# PATCH-FIX-UPSTREAM fix-64bit-only-plugins.patch -- Requires 64bit memory alignment ( https://github.com/mumble-voip/mumble/issues/5849 )
+Patch0:         fix-64bit-only-plugins.patch
 BuildRequires:  cmake >= 3.15
 BuildRequires:  gcc-c++
 BuildRequires:  libcap-devel