diff --git a/libprojectM.spec b/libprojectM.spec
index 43d4847..652afad 100644
--- a/libprojectM.spec
+++ b/libprojectM.spec
@@ -1,5 +1,5 @@
 Name:          libprojectM
-Version:       2.1.0
+Version:       3.1.7
 Release:       1mamba
 Summary:       An advanced MilkDrop-compatible music visualization library
 Group:         System/Libraries
@@ -7,7 +7,8 @@ Vendor:        openmamba
 Distribution:  openmamba
 Packager:      Silvan Calarco <silvan.calarco@mambasoft.it>
 URL:           http://projectm.sourceforge.net/
-Source:        http://downloads.sourceforge.net/project/projectm/%{version}/projectM-complete-%{version}-Source.tar.gz
+Source:        https://github.com/projectM-visualizer/projectm.git/v%{version}/projectm-%{version}.tar.bz2
+#Source:        http://downloads.sourceforge.net/project/projectm/%{version}/projectM-complete-%{version}-Source.tar.gz
 Patch0:        libprojectM-2.0.1-soname.patch
 Patch1:        libprojectM-2.0.1-USE_THREADS.patch
 # patches for clementine
@@ -16,22 +17,19 @@ Patch3:        04-change-preset-duration.patch
 Patch4:        05-fix-windows-crashes.patch
 Patch5:        06-fix-numeric-locale.patch
 License:       LGPL
-BuildRequires: cmake
 ## AUTOBUILDREQ-BEGIN
 BuildRequires: glibc-devel
-BuildRequires: libfreetype-devel
-BuildRequires: libftgl-devel
-BuildRequires: libgcc
+BuildRequires: ldconfig
 BuildRequires: libGL-devel
-BuildRequires: libglew-devel
-BuildRequires: libGLU-devel
-BuildRequires: libgomp-devel
-BuildRequires: libICE-devel
-BuildRequires: libSM-devel
+BuildRequires: libSDL2-devel
+BuildRequires: libgcc
+BuildRequires: libjack-devel
+BuildRequires: libpulseaudio-devel
+BuildRequires: libqt5-devel
 BuildRequires: libstdc++6-devel
-BuildRequires: libX11-devel
-BuildRequires: libXext-devel
 ## AUTOBUILDREQ-END
+BuildRequires: cmake
+Requires:      %{name}-common = %{?epoch:%epoch:}%{version}-%{release}
 BuildRoot:     %{_tmppath}/%{name}-%{version}-root
 
 %description
@@ -48,6 +46,16 @@ projectM is an OpenGL based advanced music visualization program for Linux, Mac
 It is backward compatible with all the features of Milkdrop 1.x, but has many new toys and enhancements.
 This package contains static libraries and header files needed for development.
 
+%package common
+Group:         System/Libraries
+Summary:       Common files provided with %{name}
+Requires:      %{name} = %{?epoch:%epoch:}%{version}-%{release}
+
+%description common
+projectM is an OpenGL based advanced music visualization program for Linux, Mac OSX, and Windows. 
+It is backward compatible with all the features of Milkdrop 1.x, but has many new toys and enhancements.
+This package contains the common files provided with %{name}.
+
 %package qt
 Group:         System/Libraries
 Summary:       An advanced MilkDrop-compatible music visualization library for Qt
@@ -78,21 +86,39 @@ projectM is an OpenGL based advanced music visualization program for Linux, Mac
 It is backward compatible with all the features of Milkdrop 1.x, but has many new toys and enhancements.
 This package contains the Pulseaudio tool for %{name}.
 
+%package -n projectM-jack
+Group:         Applications/Multimedia
+Summary:       Jack tool for %{name}
+Requires:      %{name} = %{?epoch:%epoch:}%{version}-%{release}
+
+%description -n projectM-jack
+projectM is an OpenGL based advanced music visualization program for Linux, Mac OSX, and Windows. 
+It is backward compatible with all the features of Milkdrop 1.x, but has many new toys and enhancements.
+This package contains the Pulseaudio tool for %{name}.
+
+%debug_package
+
 %prep
-%setup -q -n projectM-complete-%{version}-Source
+%setup -q -n projectm-%{version}
+#-D -T
+#:<< _EOF
+./autogen.sh
 
 %build
-%cmake -d build \
-   -DCMAKE_BUILD_TYPE=RELEASE \
-   -DLIB_INSTALL_DIR=%{_libdir} \
-   -DCMAKE_INSTALL_PREFIX=%{_prefix} \
-   -DINCLUDE-PROJECTM-TEST:BOOL=FALSE
+#:<< _EOF
+%configure \
+   --enable-qt \
+   --enable-pulseaudio \
+   --enable-jack \
+%ifarch arm aarch64
+   --enable-gles
+%endif
 
 %make
 
 %install
 [ "%{buildroot}" != / ] && rm -rf "%{buildroot}"
-%makeinstall -C build
+%makeinstall
 
 %clean
 [ "%{buildroot}" != / ] && rm -rf "%{buildroot}"
@@ -106,40 +132,47 @@ This package contains the Pulseaudio tool for %{name}.
 %files
 %defattr(-,root,root)
 %{_libdir}/libprojectM.so.*
-%{_libdir}/libvisual-*/actor/libprojectM_libvisual.so
+
+%files common
+%defattr(-,root,root)
+%{_bindir}/projectMSDL
 %dir %{_datadir}/projectM
 %{_datadir}/projectM/config.inp
 %dir %{_datadir}/projectM/fonts
 %{_datadir}/projectM/fonts/*.ttf
 %{_datadir}/projectM/presets
-%{_datadir}/projectM/shaders/blur.cg
-%{_datadir}/projectM/shaders/projectM.cg
+%{_datadir}/icons/hicolor/scalable/apps/projectM.svg
 
 %files devel
 %defattr(-,root,root)
+%{_bindir}/projectM-unittest
 %dir %{_includedir}/libprojectM
 %{_includedir}/libprojectM/*.hpp
 %{_includedir}/libprojectM/*.h
+%{_libdir}/libprojectM.a
+%{_libdir}/libprojectM.la
 %{_libdir}/libprojectM.so
 %{_libdir}/pkgconfig/libprojectM.pc
 
-%files qt
-%defattr(-,root,root)
-%{_libdir}/libprojectM-qt.so.*
-
-%files qt-devel
-%dir %{_includedir}/libprojectM-qt
-%{_includedir}/libprojectM-qt/qprojectm*.hpp
-%{_libdir}/libprojectM-qt.so
-%{_libdir}/pkgconfig/libprojectM-qt.pc
-
 %files -n projectM-pulseaudio
 %defattr(-,root,root)
 %{_bindir}/projectM-pulseaudio
 %{_datadir}/applications/projectM-pulseaudio.desktop
-%{_datadir}/pixmaps/prjm16-transparent.svg
+%{_mandir}/man1/projectM-pulseaudio.1*
+
+%files -n projectM-jack
+%defattr(-,root,root)
+%{_bindir}/projectM-jack
+%{_datadir}/applications/projectM-jack.desktop
+%{_mandir}/man1/projectM-jack.1*
 
 %changelog
+* Wed Jan 27 2021 Silvan Calarco <silvan.calarco@mambasoft.it> 3.1.7-1mamba
+- update to 3.1.7
+
+* Wed Jan 27 2021 Silvan Calarco <silvan.calarco@mambasoft.it> 2.2.1-1mamba
+- update to 2.2.1
+
 * Sat Dec 08 2012 Automatic Build System <autodist@mambasoft.it> 2.1.0-1mamba
 - update to 2.1.0