diff --git a/mixxx.spec b/mixxx.spec
index 85c7e52..3e0d9ec 100644
--- a/mixxx.spec
+++ b/mixxx.spec
@@ -1,40 +1,60 @@
 Name:          mixxx
-Version:       2.2.4
-Release:       2mamba
+Version:       2.3.1
+Release:       1mamba
 Summary:       An open source DJ tool designed for both professional and amateur DJs alike
 Group:         Graphical Desktop/Applications/Multimedia
 Vendor:        openmamba
 Distribution:  openmamba
 Packager:      Silvan Calarco <silvan.calarco@mambasoft.it>
-URL:           http://mixxx.sourceforge.net
-Source:        https://github.com/mixxxdj/mixxx/archive/release-%{version}.tar.gz
+URL:           https://mixxx.org/
+Source:        https://github.com/mixxxdj/mixxx.git/%{version}/mixxx-%{version}.tar.bz2
 Source1:       mixxx-desktop
 Patch:         %{name}-1.5.0-libs.patch
 Patch1:        %{name}-1.7.2-mp4.patch
 License:       GPL
-BuildRoot:     %{_tmppath}/%{name}-%{version}-root
 ## AUTOBUILDREQ-BEGIN
 BuildRequires: glibc-devel
-BuildRequires: libalsa-devel
-BuildRequires: libdjconsole-devel
-BuildRequires: libfaad2-devel
+BuildRequires: libICE-devel
+BuildRequires: libSM-devel
+BuildRequires: libX11-devel
+BuildRequires: libXext-devel
+BuildRequires: libavcodec-ffmpeg-devel
+BuildRequires: libavformat-ffmpeg-devel
+BuildRequires: libavutil-ffmpeg-devel
+BuildRequires: libchromaprint-devel
+BuildRequires: libebur128-devel
+BuildRequires: libflac-devel
 BuildRequires: libgcc
-BuildRequires: libGL-devel
 BuildRequires: libglib-devel
-BuildRequires: libGLU-devel
-BuildRequires: libgpod-devel
-BuildRequires: libgtk-devel
+BuildRequires: libglvnd-devel
+BuildRequires: libhidapi-devel
 BuildRequires: libid3tag-devel
+BuildRequires: libkeyfinder-devel
 BuildRequires: liblame-devel
+BuildRequires: liblilv-devel
 BuildRequires: libmad-devel
+BuildRequires: libmodplug-devel
 BuildRequires: libmp4v2-devel
 BuildRequires: libogg-devel
+BuildRequires: libopenssl-devel
+BuildRequires: libopus-devel
+BuildRequires: libopusfile-devel
 BuildRequires: libportaudio-devel
-BuildRequires: libqt4-devel
-BuildRequires: libshout-devel
+BuildRequires: libportmidi-devel
+BuildRequires: libprotobuf-devel
+BuildRequires: libqt5-devel
+BuildRequires: libqtkeychain-devel
+BuildRequires: librubberband-devel
 BuildRequires: libsndfile-devel
+BuildRequires: libsoundtouch-devel
+BuildRequires: libsqlite-devel
 BuildRequires: libstdc++6-devel
+BuildRequires: libswresample-ffmpeg-devel
+BuildRequires: libtag-devel
+BuildRequires: libupower-devel
+BuildRequires: libusb-devel
 BuildRequires: libvorbis-devel
+BuildRequires: libwavpack-devel
 ## AUTOBUILDREQ-END
 BuildRequires: libchromaprint-devel >= 1.3.1-1mamba
 BuildRequires: libsndfile-devel >= 1.0.17
@@ -46,6 +66,7 @@ BuildRequires: libportmidi-devel
 BuildRequires: libprotobuf-devel >= 1.6.1
 BuildRequires: scons
 BuildRequires: libtag-devel >= 1.9
+BuildRequires: libkeyfinder-devel
 
 %description
 Mixxx is an open source DJ tool designed for both professional and amateur DJs alike.
@@ -55,23 +76,31 @@ Futhermore, Mixxx has a number of key features to help DJs in the mix: Beat esti
 %debug_package
 
 %prep
-%setup -q -n mixxx-release-%{version}
+%setup -q
+#-D -T
 #%patch -p1
 #%patch1 -p1
 
 %build
+#:<< _EOF
+%cmake -d build
+
+%make
+
 #scons \
 #   prefix=%{_prefix} qtdir=%{_qt4_prefix} \
 #   ipod=1 ladspa=1 djconsole=1 shoutcast=1 tonal=1 m4a=1 script=1 test=1 jack=1
 
 %install
 [ "%{buildroot}" != / ] && rm -rf "%{buildroot}"
-scons \
-   prefix=%{_prefix} install_root=%{buildroot}%{_prefix} qtdir=%{_qt5_prefix} \
-   djconsole=1 shoutcast=1 tonal=1 m4a=1 jack=1 \
-   install
+%makeinstall -C build
 
-install -m0644 %{SOURCE1} %{buildroot}%{_datadir}/applications/mixxx.desktop
+#scons \
+#   prefix=%{_prefix} install_root=%{buildroot}%{_prefix} qtdir=%{_qt5_prefix} \
+#   djconsole=1 shoutcast=1 tonal=1 m4a=1 jack=1 \
+#   install
+
+#install -m0644 %{SOURCE1} %{buildroot}%{_datadir}/applications/mixxx.desktop
 ## Warning: INSTALL_ROOT is passed this way as a trick
 #make install -C src INSTALL_ROOT=%{buildroot}%{_builddir}/%{name}-%{version}
 
@@ -81,36 +110,40 @@ install -m0644 %{SOURCE1} %{buildroot}%{_datadir}/applications/mixxx.desktop
 %files
 %defattr(-,root,root)
 %{_bindir}/mixxx
-%dir %{_prefix}/lib/mixxx
-%dir %{_prefix}/lib/mixxx/plugins
-%dir %{_prefix}/lib/mixxx/plugins/vampqt5
-%{_prefix}/lib/mixxx/plugins/vampqt5/libmixxxminimal.so
-%{_datadir}/applications/mixxx.desktop
-%{_datadir}/appdata/mixxx.appdata.xml
+#%dir %{_prefix}/lib/mixxx
+#%dir %{_prefix}/lib/mixxx/plugins
+#%dir %{_prefix}/lib/mixxx/plugins/vampqt5
+#%{_prefix}/lib/mixxx/plugins/vampqt5/libmixxxminimal.so
+%{_udevrulesdir}/69-mixxx-usb-uaccess.rules
+%{_datadir}/applications/org.mixxx.Mixxx.desktop
+%{_datadir}/metainfo/org.mixxx.Mixxx.metainfo.xml
 %dir %{_datadir}/mixxx
 %dir %{_datadir}/mixxx/controllers
 %{_datadir}/mixxx/controllers/*
+%{_datadir}/mixxx/controllers/.eslintrc.json
 %dir %{_datadir}/mixxx/keyboard
 %{_datadir}/mixxx/keyboard/*.cfg
+%dir %{_datadir}/mixxx/script
+%{_datadir}/mixxx/script/.eslintrc.json
+%{_datadir}/mixxx/script/*
 %dir %{_datadir}/mixxx/skins
-#%{_datadir}/mixxx/midi/*
 %{_datadir}/mixxx/skins/*
-%{_datadir}/pixmaps/mixxx_icon.svg
-#%{_datadir}/mixxx/ladspa_presets/*.xml
-#%{_libdir}/mixxx/plugins/soundsource/libsoundsourcem4a.so
 %{_docdir}/mixxx/LICENSE
-%{_docdir}/mixxx/Mixxx-Manual.pdf
-%{_docdir}/mixxx/README
-#%{_datadir}/mixxx/schema.xml
+%dir %{_datadir}/doc/mixxx
+%{_datadir}/doc/mixxx/*
 %{_datadir}/mixxx/translations/mixxx_*.qm
-#%{_docdir}/mixxx-%{version}/*
-%dir %{_datadir}/mixxx/fonts
-%{_datadir}/mixxx/fonts/OpenSans*
-%{_datadir}/mixxx/fonts/Ubuntu*
+#%dir %{_datadir}/mixxx/fonts
+#%{_datadir}/mixxx/fonts/OpenSans*
+#%{_datadir}/mixxx/fonts/Ubuntu*
+%{_datadir}/icons/hicolor/*/apps/mixxx.png
+%{_datadir}/icons/hicolor/scalable/apps/mixxx.svg
 %doc COPYING LICENSE
 #README README.macro Mixxx-Manual.pdf
 
 %changelog
+* Fri Oct 22 2021 Silvan Calarco <silvan.calarco@mambasoft.it> 2.3.1-1mamba
+- update to 2.3.1
+
 * Wed May 20 2020 Silvan Calarco <silvan.calarco@mambasoft.it> 2.2.4-2mamba
 - rebuilt with debug package