diff --git a/poedit.spec b/poedit.spec
index 9529bbe..ea0b9c0 100644
--- a/poedit.spec
+++ b/poedit.spec
@@ -1,5 +1,5 @@
 Name:          poedit
-Version:       1.8.7.1
+Version:       2.3.1
 Release:       1mamba
 Summary:       A cross-platform gettext catalogs (.po files) editor
 Group:         Graphical Desktop/Applications/Development
@@ -12,17 +12,17 @@ Patch:         %{name}-1.4.6.1-desktop.patch
 License:       MIT
 ## AUTOBUILDREQ-BEGIN
 BuildRequires: glibc-devel
+BuildRequires: ldconfig
 BuildRequires: libatk-devel
 BuildRequires: libboost-devel
 BuildRequires: libcairo-devel
-BuildRequires: libdb51-devel
 BuildRequires: libenchant-devel
-BuildRequires: libexpat-devel
 BuildRequires: libgcc
 BuildRequires: libgdk-pixbuf-devel
 BuildRequires: libglib-devel
 BuildRequires: libgtk-devel
 BuildRequires: libgtkspell3-devel
+BuildRequires: libharfbuzz-devel
 BuildRequires: libicu-devel
 BuildRequires: liblucene++-devel
 BuildRequires: libpango-devel
@@ -37,13 +37,18 @@ poEdit is cross-platform gettext catalogs (.po files) editor.
 It is built with wxWidgets toolkit and can run on any platform supported by it.
 It aims to provide more convenient approach to editing catalogs than launching vi and editing the file by hand.
 
+%debug_package
+
 %prep
 %setup -q
 #%patch -p1
 
 %build
-%configure
-%make
+%configure \
+   --libexecdir=%{_libdir}/poedit \
+   --with-wx-config=/usr/bin/wx-config-unicode-3
+
+%make CPPFLAGS+=' -DUCHAR_TYPE=uint16_t'
 
 %install
 [ "%{buildroot}" != / ] && rm -rf "%{buildroot}"
@@ -58,18 +63,17 @@ It aims to provide more convenient approach to editing catalogs than launching v
 %defattr(-,root,root)
 %{_bindir}/%{name}
 %{_datadir}/%{name}
-%{_libexecdir}/poedit-dump-legacy-tm
-%{_datadir}/applications/poedit-uri.desktop
-%{_datadir}/applications/%{name}.desktop
-%{_datadir}/icons/hicolor/*/apps/%{name}.*
-%{_datadir}/icons/hicolor/*/mimetypes/*.png
-%{_datadir}/icons/hicolor/scalable/mimetypes/*.svg
-%{_datadir}/pixmaps/%{name}.png
+%{_datadir}/applications/net.poedit.Poedit*.desktop
+%{_datadir}/icons/hicolor/*/apps/net.poedit.Poedit.png
+%{_datadir}/metainfo/net.poedit.Poedit.appdata.xml
 %{_mandir}/man1/*
 %doc AUTHORS COPYING
 #NEWS README TODO
 
 %changelog
+* Tue Jun 23 2020 Silvan Calarco <silvan.calarco@mambasoft.it> 2.3.1-1mamba
+- update to 2.3.1
+
 * Wed Mar 30 2016 Silvan Calarco <silvan.calarco@mambasoft.it> 1.8.7.1-1mamba
 - update to 1.8.7.1