diff --git a/xmms2.spec b/xmms2.spec
index a3851b2..72f73a0 100644
--- a/xmms2.spec
+++ b/xmms2.spec
@@ -4,31 +4,33 @@
 %define minver %(echo %version | cut -d. -f 3)
 
 Name:          xmms2
-Version:       0.8DrO_o
+Version:       0.8DrO_o.20201017git
 Epoch:         1
-Release:       4mamba
+Release:       1mamba
 Summary:       A multimedia player that has most of the features as WinAmp
 Group:         Graphical Desktop/Applications/Multimedia
 Vendor:        openmamba
 Distribution:  openmamba
 Packager:      Fabio Giani <fabio.giani@gmail.com>
 URL:           http://xmms2.xmms.se/
-Source0:       http://downloads.sourceforge.net/project/xmms2/xmms2/%{majver}%20%{minver}/xmms2-%{majver}%{minver}.tar.bz2
+Source0:       https://github.com/xmms2/xmms2-devel.git/master/xmms2-devel-%{version}.tar.bz2
+#Source0:       http://downloads.sourceforge.net/project/xmms2/xmms2/%{majver}%20%{minver}/xmms2-%{majver}%{minver}.tar.bz2
 Source1:       xmms2-desktopfile
 Patch0:        xmms2-0.8DrO_o-cython-1.9.patch
 Patch1:        xmms2-0.8DrO_o-libavcodec-ffmpeg-1.2.1.patch
 Patch2:        xmms2-0.8DrO_o-ffmpeg-2.2.patch
 License:       GPL
 ## AUTOBUILDREQ-BEGIN
+BuildRequires: fluidsynth-devel
 BuildRequires: glibc-devel
+BuildRequires: ldconfig
 BuildRequires: libalsa-devel
 BuildRequires: libao-devel
-%if "%{stage1}" != "1"
 BuildRequires: libavahi-devel
 BuildRequires: libavahi-glib-devel
-%endif
 BuildRequires: libavcodec-ffmpeg-devel
 BuildRequires: libcdio-devel
+BuildRequires: libcdio-paranoia-devel
 BuildRequires: libcurl-devel
 BuildRequires: libdiscid-devel
 BuildRequires: libecore-devel
@@ -39,38 +41,32 @@ BuildRequires: libfftw-devel
 BuildRequires: libflac-devel
 BuildRequires: libgcc
 BuildRequires: libglib-devel
-%if "%{stage1}" != "1"
 BuildRequires: libjack-devel
-%endif
 BuildRequires: libmad-devel
 BuildRequires: libmms-devel
 BuildRequires: libmodplug-devel
-BuildRequires: libmusepack-devel
+BuildRequires: libmpg123-devel
+BuildRequires: libncurses-devel
 BuildRequires: libofa-devel
 BuildRequires: libogg-devel
 BuildRequires: libopenssl-devel
+BuildRequires: libperl
 BuildRequires: libpulseaudio-devel
-BuildRequires: libpython27-devel
-BuildRequires: libpython-devel
 BuildRequires: libreadline-devel
+BuildRequires: libruby-devel
 BuildRequires: libsamplerate-devel
 BuildRequires: libshout-devel
-%if "%{stage1}" != "1"
 BuildRequires: libsmbclient-devel
-%endif
 BuildRequires: libsndfile-devel
 BuildRequires: libspeex-devel
 BuildRequires: libsqlite-devel
 BuildRequires: libstdc++6-devel
-BuildRequires: libtheora-devel
 BuildRequires: libvorbis-devel
 BuildRequires: libvorbisidec-devel
 BuildRequires: libwavpack-devel
 BuildRequires: libxml2-devel
-BuildRequires: mpg123-devel
-BuildRequires: perl-devel
 BuildRequires: perl-Glib
-BuildRequires: ruby-devel
+BuildRequires: perl-devel
 ## AUTOBUILDREQ-END
 BuildRequires: autoconf-archive
 %if "%{stage1}" != "1"
@@ -83,8 +79,8 @@ BuildRequires: Pyrex
 BuildRequires: perl-Glib
 %endif
 BuildRequires: doxygen
-BuildRequires: gst-plugins-good-devel
-BuildRequires: python-rhpl
+#BuildRequires: gst-plugins-good-devel
+#BuildRequires: python-rhpl
 BuildRequires: valgrind-devel
 BuildRoot:     %{_tmppath}/%{name}-%{version}-root
 
@@ -129,15 +125,21 @@ Provides:       xmms2-devel
 %description -n libxmms2-devel
 Development libraries and headers for XMMS2. You probably need this to develop or build new plugins for XMMS2. 
 
+%debug_package
+
 %prep
-%setup -q -n %{name}-%{majver}%{minver}
-%patch0 -p1
-%patch1 -p1
-%patch2 -p1
+%setup -q -n %{name}-devel-%{version}
+#%patch0 -p1
+#%patch1 -p1
+#%patch2 -p1
 
 # This header doesn't need to be executable
 chmod -x src/include/xmmsclient/xmmsclient++/dict.h
 
+sed -i '$a#define AVCODEC_MAX_AUDIO_FRAME_SIZE 192000 /* 1 second of 48kHz 32bit audio */' src/plugins/avcodec/avcodec_compat.h
+sed -i 's,#include <cdio/cdda.h>,#include <cdio/paranoia/cdda.h>,' src/plugins/cdda/cdda.c
+sed -i 's,libsmbclient.h,samba-4.0/libsmbclient.h,' src/plugins/samba/{samba.c,wscript}
+	
 ## Clean up paths in wafadmin
 #WAFADMIN_FILES=`find wafadmin/ -type f`
 #for i in $WAFADMIN_FILES; do
@@ -146,12 +148,14 @@ chmod -x src/include/xmmsclient/xmmsclient++/dict.h
 #sed -i 's|"lib"|"%{_lib}"|g' wscript
 
 %build
+export LIBDIR="%{_libdir}"
 ./waf configure \
    --prefix=%{_prefix} \
    --libdir=%{_libdir} \
    --with-ruby-libdir=%{ruby_sitearch} \
    --with-perl-archdir=%{perl_archlib} \
-   --with-pkgconfigdir=%{_libdir}/pkgconfig
+   --with-pkgconfigdir=%{_libdir}/pkgconfig \
+   --without-optionals=python
 
 # --with-libdir=%{_libdir}
 ./waf build
@@ -163,21 +167,16 @@ doxygen -u
 
 export LIBDIR="%{_libdir}"
 ./waf install \
-   --destdir=%{buildroot} \
-   --prefix=%{_prefix} \
-   --with-ruby-libdir=%{ruby_sitearch} \
-   --with-perl-archdir=%{perl_archlib} \
-   --with-pkgconfigdir=%{_libdir}/pkgconfig
-# --with-libdir=%{_libdir}
+   --destdir=%{buildroot}
 
 # exec flags for debuginfo
 chmod +x %{buildroot}%{_libdir}/%{name}/*
 chmod +x %{buildroot}%{_libdir}/libxmmsclient*.so*
 chmod +x %{buildroot}%{perl_archlib}/auto/Audio/XMMSClient/XMMSClient.so
 chmod +x %{buildroot}%{ruby_sitearch}/xmmsclient_*.so
-%if "%{stage1}" != "1"
-chmod +x %{buildroot}%{python_sitearch}/xmmsclient/xmmsapi.so \
-%endif
+#%if "%{stage1}" != "1"
+#chmod +x %{buildroot}%{python_sitearch}/xmmsclient/xmmsapi.so \
+#%endif
 
 ## Convert to utf-8
 #for i in %{buildroot}%{_mandir}/man1/*.gz; do
@@ -203,14 +202,16 @@ install -D -m644 %{S:1} \
 %files
 %defattr(-,root,root)
 %{_bindir}/%{name}*
-#%{_bindir}/vistest*
+%{_bindir}/_xmms2-migrate-collections-v0
+%{_bindir}/sqlite2s4
+%dir %{_datadir}/%{name}
+%{_datadir}/%{name}/*
+%{_datadir}/applications/xmms2.desktop
 %{_mandir}/man1/%{name}*
 %{_datadir}/pixmaps/%{name}*
-%{_datadir}/%{name} 
-%{_datadir}/applications/xmms2.desktop
-%{python_sitearch}/xmmsclient/
 %{ruby_sitearch}/xmmsclient*
-%{_bindir}/nyxmms2
+#%{python_sitearch}/xmmsclient/
+#%{_bindir}/nyxmms2
 #%{_mandir}/man1/nyxmms2.* 
 %doc COPYING.GPL
 
@@ -218,57 +219,7 @@ install -D -m644 %{S:1} \
 %defattr(-,root,root)
 %{_libdir}/libxmmsclient*.so.*
 %dir %{_libdir}/%{name}
-%{_libdir}/xmms2/libxmms_airplay.so
-%{_libdir}/xmms2/libxmms_alsa.so
-%{_libdir}/xmms2/libxmms_ao.so
-%{_libdir}/xmms2/libxmms_apefile.so
-%{_libdir}/xmms2/libxmms_asf.so
-%{_libdir}/xmms2/libxmms_asx.so
-%{_libdir}/xmms2/libxmms_avcodec.so
-%{_libdir}/xmms2/libxmms_cdda.so
-%{_libdir}/xmms2/libxmms_cue.so
-%{_libdir}/xmms2/libxmms_curl.so
-%{_libdir}/xmms2/libxmms_daap.so
-%{_libdir}/xmms2/libxmms_diskwrite.so
-%{_libdir}/xmms2/libxmms_equalizer.so
-%{_libdir}/xmms2/libxmms_faad.so
-%{_libdir}/xmms2/libxmms_file.so
-%{_libdir}/xmms2/libxmms_flac.so
-%{_libdir}/xmms2/libxmms_flv.so
-%{_libdir}/xmms2/libxmms_gvfs.so
-%{_libdir}/xmms2/libxmms_html.so
-%{_libdir}/xmms2/libxmms_ices.so
-%{_libdir}/xmms2/libxmms_icymetaint.so
-%{_libdir}/xmms2/libxmms_id3v2.so
-%{_libdir}/xmms2/libxmms_jack.so
-%{_libdir}/xmms2/libxmms_karaoke.so
-%{_libdir}/xmms2/libxmms_m3u.so
-%{_libdir}/xmms2/libxmms_mad.so
-%{_libdir}/xmms2/libxmms_mms.so
-%{_libdir}/xmms2/libxmms_modplug.so
-%{_libdir}/xmms2/libxmms_mp4.so
-%{_libdir}/xmms2/libxmms_mpg123.so
-%{_libdir}/xmms2/libxmms_musepack.so
-%{_libdir}/xmms2/libxmms_normalize.so
-%{_libdir}/xmms2/libxmms_null.so
-%{_libdir}/xmms2/libxmms_nulstripper.so
-%{_libdir}/xmms2/libxmms_ofa.so
-%{_libdir}/xmms2/libxmms_oss.so
-%{_libdir}/xmms2/libxmms_pls.so
-%{_libdir}/xmms2/libxmms_pulse.so
-%{_libdir}/xmms2/libxmms_replaygain.so
-%{_libdir}/xmms2/libxmms_rss.so
-%{_libdir}/xmms2/libxmms_samba.so
-%{_libdir}/xmms2/libxmms_sndfile.so
-%{_libdir}/xmms2/libxmms_speex.so
-%{_libdir}/xmms2/libxmms_tremor.so
-%{_libdir}/xmms2/libxmms_tta.so
-%{_libdir}/xmms2/libxmms_vocoder.so
-%{_libdir}/xmms2/libxmms_vorbis.so
-%{_libdir}/xmms2/libxmms_wave.so
-%{_libdir}/xmms2/libxmms_wavpack.so
-%{_libdir}/xmms2/libxmms_xml.so
-%{_libdir}/xmms2/libxmms_xspf.so
+%{_libdir}/xmms2/libxmms_*.so
 %doc AUTHORS COPYING COPYING.LGPL
 
 %files -n libxmms2-devel
@@ -277,7 +228,7 @@ install -D -m644 %{S:1} \
 %{_includedir}/%{name}/*
 %{_libdir}/libxmmsclient*.so
 %{_libdir}/pkgconfig/%{name}-*.pc 
-%doc README TODO
+%doc TODO
 
 %files -n perl-xmms2
 %defattr(-,root,root)
@@ -285,6 +236,12 @@ install -D -m644 %{S:1} \
 %{perl_archlib}/auto/Audio/
 
 %changelog
+* Sat Oct 17 2020 Silvan Calarco <silvan.calarco@mambasoft.it> 0.8DrO_o.20201017git-1mamba
+- update to 0.8DrO_o.20201017git
+
+* Sat Oct 17 2020 Silvan Calarco <silvan.calarco@mambasoft.it> 0.8DrO_o-5mamba
+- rebuilt
+
 * Thu May 15 2014 Silvan Calarco <silvan.calarco@mambasoft.it> 0.8DrO_o-4mamba
 - ffmpeg 2.2 rebuild