diff --git a/soversion.diff b/soversion.diff
index 2a57e43..d23f508 100644
--- a/soversion.diff
+++ b/soversion.diff
@@ -11,46 +11,11 @@ to do it. As we have a vendor suffix, no filename conflicts can occur.
 
 The ABI may not always change, so one needs to look at the diff
 between versions for whether or not soversion.diff needs an update.
----
- Makefile.in               |    5 +++--
- build/aclocal/bakefile.m4 |    3 +--
- 2 files changed, 4 insertions(+), 4 deletions(-)
 
-Index: wxWidgets-3.1.0.2244/Makefile.in
-===================================================================
---- wxWidgets-3.1.0.2244.orig/Makefile.in
-+++ wxWidgets-3.1.0.2244/Makefile.in
-@@ -2158,6 +2158,7 @@ LOCALE_MSW_LINGUAS =  it
- @COND_OFFICIAL_BUILD_0_PLATFORM_WIN32_1@WXCOMPILER = _gcc
- @COND_OFFICIAL_BUILD_1_PLATFORM_WIN32_1@WXCOMPILER \
- @COND_OFFICIAL_BUILD_1_PLATFORM_WIN32_1@	= _gcc$(COMPILER_VERSION)
-+VENDORTAG = -$(VENDOR)
- @COND_OFFICIAL_BUILD_0_PLATFORM_WIN32_1@VENDORTAG = _$(VENDOR)
- @COND_OFFICIAL_BUILD_1_PLATFORM_WIN32_1@VENDORTAG = 
- @COND_BUILD_debug@WXDEBUGFLAG = d
-@@ -2169,7 +2170,7 @@ LOCALE_MSW_LINGUAS =  it
- @COND_PLATFORM_WIN32_0@WXDLLNAMEPREFIXGUI = wx_$(PORTNAME)$(WXUNIVNAME)
- @COND_PLATFORM_WIN32_1@WXDLLNAMEPREFIXGUI = \
- @COND_PLATFORM_WIN32_1@	wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)
--@COND_PLATFORM_WIN32_0@WXDLLVERSIONTAG = -$(WX_RELEASE)
-+@COND_PLATFORM_WIN32_0@WXDLLVERSIONTAG =
- @COND_PLATFORM_WIN32_1@WXDLLVERSIONTAG = 
- COND_wxUSE_REGEX_builtin___wxregex___depname = \
- 	$(LIBDIRNAME)/$(LIBPREFIX)wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT)
-@@ -13775,7 +13776,7 @@ COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_HTML_1___htmldll_library_link_LIBR_0 \
- @COND_PLATFORM_MACOSX_1_USE_SOVERSION_1@	= .5.0.0.$(SO_SUFFIX)
- @COND_USE_SOVERCYGWIN_1_USE_SOVERSION_1@dll___targetsuf3 = -5.$(SO_SUFFIX)
- @COND_USE_SOVERSION_0@dll___targetsuf3 = .$(SO_SUFFIX)
--@COND_USE_SOVERSION_1_USE_SOVERSOLARIS_1@dll___targetsuf3 = .$(SO_SUFFIX).5
-+@COND_USE_SOVERSION_1_USE_SOVERSOLARIS_1@dll___targetsuf3 = .$(SO_SUFFIX).5.0.0
- @COND_TOOLKIT_MSW@__RCDEFDIR_p = --include-dir \
- @COND_TOOLKIT_MSW@	$(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME)
- @COND_USE_GUI_1_wxUSE_LIBTIFF_builtin@__LIB_TIFF_p \
-Index: wxWidgets-3.1.0.2244/build/aclocal/bakefile.m4
-===================================================================
---- wxWidgets-3.1.0.2244.orig/build/aclocal/bakefile.m4
-+++ wxWidgets-3.1.0.2244/build/aclocal/bakefile.m4
-@@ -443,8 +443,7 @@ AC_DEFUN([AC_BAKEFILE_SHARED_VERSIONS],
+diff -Nur wxWidgets-3.1.6/build/aclocal/bakefile.m4 new/build/aclocal/bakefile.m4
+--- wxWidgets-3.1.6/build/aclocal/bakefile.m4	2022-04-04 15:41:33.000000000 +0200
++++ new/build/aclocal/bakefile.m4	2022-04-13 18:55:02.094488718 +0200
+@@ -408,8 +408,7 @@
              SONAME_FLAG="-Wl,-soname,"
          fi
          USE_SOVERSION=1
@@ -60,3 +25,32 @@ Index: wxWidgets-3.1.0.2244/build/aclocal/bakefile.m4
        ;;
  
        *-*-solaris2* )
+diff -Nur wxWidgets-3.1.6/Makefile.in new/Makefile.in
+--- wxWidgets-3.1.6/Makefile.in	2022-04-04 15:41:33.000000000 +0200
++++ new/Makefile.in	2022-04-13 18:56:24.238890301 +0200
+@@ -2218,6 +2218,7 @@
+ @COND_OFFICIAL_BUILD_0_PLATFORM_WIN32_1@WXCOMPILER = _gcc
+ @COND_OFFICIAL_BUILD_1_PLATFORM_WIN32_1@WXCOMPILER \
+ @COND_OFFICIAL_BUILD_1_PLATFORM_WIN32_1@	= _gcc$(COMPILER_VERSION)
++VENDORTAG = -$(VENDOR)
+ @COND_OFFICIAL_BUILD_0_PLATFORM_WIN32_1@VENDORTAG = _$(VENDOR)
+ @COND_OFFICIAL_BUILD_1_PLATFORM_WIN32_1@VENDORTAG = 
+ @COND_BUILD_debug@WXDEBUGFLAG = d
+@@ -2229,7 +2230,7 @@
+ @COND_PLATFORM_WIN32_0@WXDLLNAMEPREFIXGUI = wx_$(PORTNAME)$(WXUNIVNAME)
+ @COND_PLATFORM_WIN32_1@WXDLLNAMEPREFIXGUI = \
+ @COND_PLATFORM_WIN32_1@	wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)
+-@COND_PLATFORM_WIN32_0@WXDLLVERSIONTAG = -$(WX_RELEASE)
++@COND_PLATFORM_WIN32_0@WXDLLVERSIONTAG =
+ @COND_PLATFORM_WIN32_1@WXDLLVERSIONTAG = 
+ COND_wxUSE_REGEX_builtin___wxregex___depname = \
+ 	$(LIBDIRNAME)/$(LIBPREFIX)wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT)
+@@ -13972,7 +13973,7 @@
+ @COND_PLATFORM_MACOSX_1_USE_SOVERSION_1@	= .6.0.0.$(SO_SUFFIX)
+ @COND_USE_SOVERCYGWIN_1_USE_SOVERSION_1@dll___targetsuf3 = -6.$(SO_SUFFIX)
+ @COND_USE_SOVERSION_0@dll___targetsuf3 = .$(SO_SUFFIX)
+-@COND_USE_SOVERSION_1_USE_SOVERSOLARIS_1@dll___targetsuf3 = .$(SO_SUFFIX).6
++@COND_USE_SOVERSION_1_USE_SOVERSOLARIS_1@dll___targetsuf3 = .$(SO_SUFFIX).6.0.0
+ @COND_TOOLKIT_MSW@__RCDEFDIR_p = --include-dir \
+ @COND_TOOLKIT_MSW@	$(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME)
+ @COND_USE_GUI_1_wxUSE_LIBTIFF_builtin@__LIB_TIFF_p \
diff --git a/wxWidgets-3.1.5-fix-wxIcon-wxDVC-columns.patch b/wxWidgets-3.1.5-fix-wxIcon-wxDVC-columns.patch
deleted file mode 100644
index 2a6502e..0000000
--- a/wxWidgets-3.1.5-fix-wxIcon-wxDVC-columns.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From c817a434d8d0d13a10f936af1eef0d8ffecb8069 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?V=C3=A1clav=20Slav=C3=ADk?= <vaclav@slavik.io>
-Date: Mon, 7 Jun 2021 16:15:53 +0200
-Subject: [PATCH] Fix wxIcon wxDVC columns under wxGTK
-
-b376d1402bdc48614888704cf191f82a630d93c0 accidentally broke columns
-with wxIcon type. Contrary to that commit's assumption, operator<<
-cannot convert wxIcon to wxBitmap and asserts:
-
-src/common/bmpbase.cpp(33): assert "variant.GetType() == "wxBitmap"" failed in operator<<().
-
-Fixed by restoring explicit conversion.
----
- src/gtk/dataview.cpp | 10 +++++++++-
- 1 file changed, 9 insertions(+), 1 deletion(-)
-
-diff --git a/src/gtk/dataview.cpp b/src/gtk/dataview.cpp
-index 8ffa7b7b3b5..767334e0043 100644
---- a/src/gtk/dataview.cpp
-+++ b/src/gtk/dataview.cpp
-@@ -2562,8 +2562,16 @@ wxDataViewBitmapRenderer::wxDataViewBitmapRenderer( const wxString &varianttype,
- bool wxDataViewBitmapRenderer::SetValue( const wxVariant &value )
- {
-     wxBitmap bitmap;
--    if (value.GetType() == wxS("wxBitmap") || value.GetType() == wxS("wxIcon"))
-+    if (value.GetType() == wxS("wxBitmap"))
-+    {
-         bitmap << value;
-+    }
-+    else if (value.GetType() == wxS("wxIcon"))
-+    {
-+        wxIcon icon;
-+        icon << value;
-+        bitmap.CopyFromIcon(icon);
-+    }
- 
- #ifdef __WXGTK3__
-     WX_CELL_RENDERER_PIXBUF(m_renderer)->Set(bitmap);
diff --git a/wxWidgets-3.1.5.tar.bz2 b/wxWidgets-3.1.5.tar.bz2
deleted file mode 100644
index e174308..0000000
--- a/wxWidgets-3.1.5.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:d7b3666de33aa5c10ea41bb9405c40326e1aeb74ee725bb88f90f1d50270a224
-size 22220762
diff --git a/wxWidgets-3.1.6.tar.bz2 b/wxWidgets-3.1.6.tar.bz2
new file mode 100644
index 0000000..478332a
--- /dev/null
+++ b/wxWidgets-3.1.6.tar.bz2
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:4980e86c6494adcd527a41fc0a4e436777ba41d1893717d7b7176c59c2061c25
+size 25194403
diff --git a/wxWidgets-3_2.changes b/wxWidgets-3_2.changes
index 71964ae..9ad3c0e 100644
--- a/wxWidgets-3_2.changes
+++ b/wxWidgets-3_2.changes
@@ -1,3 +1,29 @@
+-------------------------------------------------------------------
+Wed Apr 13 16:45:53 UTC 2022 - Ferdinand Thiessen <rpm@fthiessen.de>
+
+- Update to 3.1.6
+  * Many bug fixes for Wayland-specific problem.
+  * Add wxUILocale: CompareStrings(), GetLocalizedName()
+  * Add support for std::string_view to wxPrintf()
+  * Add wxString::ToInt() and ToUInt()
+  * Add wxGetNativeCpuArchitectureName()
+  * Add wxSecureZeroMemory(), wxThread::SetName()
+  * Significantly speed up wxMBConv iconv-based implementation
+  * Support searching from end in wxArrayString in STL build
+  * Several improvements to parsing dates in wxDateTime
+  * Add support for using native spell checking in wxTextCtrl
+  * Add support for style to wxWizard XRC handler
+  * Implement drawing splines in wxSVGFileDC
+  * Improve wxSpinCtrlDouble significant digits handling.
+  * wxGTK:
+    * Fix missing mouse events after enabling touch events
+    * Allow suppressing GTK diagnostics
+    * Fix getting key events from wxDataViewCtrl.
+    * Fix getting wxPrintData from the print dialog.
+    * Fix wxMediaCtrl support when using Wayland
+    * Generate wxKeyEvents for GDK_KEY_LaunchX keys
+- Drop upstream fixed wxWidgets-3.1.5-fix-wxIcon-wxDVC-columns.patch
+
 -------------------------------------------------------------------
 Fri Feb 11 14:53:40 UTC 2022 - Bjørn Lie <bjorn.lie@gmail.com>
 
diff --git a/wxWidgets-3_2.spec b/wxWidgets-3_2.spec
index ef8f135..b165be2 100644
--- a/wxWidgets-3_2.spec
+++ b/wxWidgets-3_2.spec
@@ -65,12 +65,12 @@ Name:           wxQt-3_2
 # Use default debug level, enabling exceptions
 # Other valid values: yes/no/max
 %define wx_debug %nil
-%define psonum 5_0_0
-%define sonum 5.0.0
-Version:        3.1.5
+%define psonum 6_0_0
+%define sonum 6.0.0
+Version:        3.1.6
 Release:        0
 %define wx_minor 3.1
-%define wx_micro 3.1.5
+%define wx_micro 3.1.6
 Summary:        C++ Library for Cross-Platform Development
 License:        LGPL-2.1-or-later WITH WxWindows-exception-3.1
 Group:          Development/Libraries/C and C++
@@ -82,7 +82,6 @@ Source5:        wxWidgets-3_2-rpmlintrc
 # identify and backport wxPython fixes to wxWidgets.
 Source6:        wxpython-mkdiff.sh
 Patch1:         soversion.diff
-Patch2:         wxWidgets-3.1.5-fix-wxIcon-wxDVC-columns.patch
 BuildRequires:  autoconf
 BuildRequires:  cppunit-devel
 BuildRequires:  gcc-c++