diff --git a/Update-websocketpp-configVersion.cmake.patch b/Update-websocketpp-configVersion.cmake.patch
new file mode 100644
index 0000000..938e233
--- /dev/null
+++ b/Update-websocketpp-configVersion.cmake.patch
@@ -0,0 +1,42 @@
+From bdc3895f330f10bfbef1079417c023d4f4157673 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Wolfgang=20St=C3=B6ggl?= <c72578@yahoo.de>
+Date: Fri, 1 May 2020 14:39:31 +0200
+Subject: [PATCH] Update websocketpp-configVersion.cmake
+
+- Disable check for same 32/64bit-ness. Use the ARCH_INDEPENDENT option
+  for CMake 3.14 and newer.
+- Use AnyNewerVersion instead of ExactVersion in order to increase
+  compatibility. Otherwise cmake find_package will fail, if the version
+  is not exactly the same.
+---
+ CMakeLists.txt | 17 ++++++++++++++---
+ 1 file changed, 14 insertions(+), 3 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index bff3654e..198ffd93 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -272,9 +272,20 @@ configure_package_config_file(websocketpp-config.cmake.in
+   INSTALL_DESTINATION "${INSTALL_CMAKE_DIR}"
+   NO_CHECK_REQUIRED_COMPONENTS_MACRO
+ )
+-write_basic_package_version_file("${PROJECT_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/websocketpp-configVersion.cmake"
+-  VERSION ${WEBSOCKETPP_VERSION}
+-  COMPATIBILITY ExactVersion)
++if (${CMAKE_VERSION} VERSION_LESS "3.14.0")
++    # Disable check for same 32/64bit-ness in websocketpp-configVersion.cmake by setting CMAKE_SIZEOF_VOID_P
++    set (CMAKE_SIZEOF_VOID_P "")
++    write_basic_package_version_file("${PROJECT_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/websocketpp-configVersion.cmake"
++      VERSION ${WEBSOCKETPP_VERSION}
++      COMPATIBILITY AnyNewerVersion)
++else ()
++    # Use ARCH_INDEPENDENT option introduced in CMake 3.14
++    # ARCH_INDEPENDENT is intended for header-only libraries or similar packages with no binaries
++    write_basic_package_version_file("${PROJECT_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/websocketpp-configVersion.cmake"
++      VERSION ${WEBSOCKETPP_VERSION}
++      COMPATIBILITY AnyNewerVersion
++      ARCH_INDEPENDENT)
++endif ()
+ 
+ # Install the websocketpp-config.cmake and websocketpp-configVersion.cmake
+ install (FILES
diff --git a/websocketpp.changes b/websocketpp.changes
index 7896e7e..c0009b9 100644
--- a/websocketpp.changes
+++ b/websocketpp.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Mon Nov  2 08:44:13 UTC 2020 - Wolfgang Bauer <wbauer@tmo.at>
+
+- Add Update-websocketpp-configVersion.cmake.patch to fix noarch
+  violations and make the package really noarch again
+
 -------------------------------------------------------------------
 Wed Aug 19 12:29:24 UTC 2020 - Callum Farmer <callumjfarmer13@gmail.com>
 
diff --git a/websocketpp.spec b/websocketpp.spec
index ae4bf41..afea147 100644
--- a/websocketpp.spec
+++ b/websocketpp.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package websocketpp
 #
-# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2020 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -12,7 +12,7 @@
 # license that conforms to the Open Source Definition (Version 1.9)
 # published by the Open Source Initiative.
 
-# Please submit bugfixes or comments via http://bugs.opensuse.org/
+# Please submit bugfixes or comments via https://bugs.opensuse.org/
 #
 
 
@@ -25,6 +25,8 @@ Group:          Development/Libraries/C and C++
 URL:            http://www.zaphoyd.com/websocketpp
 Source0:        https://github.com/zaphoyd/websocketpp/archive/%{version}.tar.gz#/%{name}-%{version}.tar.gz
 Source1:        websocketpp.pc
+# PATCH-FIX-UPSTREAM - https://github.com/zaphoyd/websocketpp/pull/888
+Patch0:         Update-websocketpp-configVersion.cmake.patch
 BuildRequires:  cmake >= 2.6
 BuildRequires:  gcc-c++
 BuildRequires:  pkgconfig
@@ -55,6 +57,7 @@ iostreams and one based on Boost Asio.
 
 %prep
 %setup -q
+%patch0 -p1
 
 %build
 %if 0%{?suse_version} >= 1310