diff --git a/libdbusmenu.spec b/libdbusmenu.spec
index 000fd4e..94c8b34 100644
--- a/libdbusmenu.spec
+++ b/libdbusmenu.spec
@@ -1,7 +1,7 @@
 %define majver %(echo %version | cut -d. -f1-2)
 Name:          libdbusmenu
 Version:       16.04.0
-Release:       2mamba
+Release:       3mamba
 Summary:       DBus Menu Library
 Group:         System/Libraries
 Vendor:        openmamba
@@ -27,7 +27,6 @@ BuildRequires: libpango-devel
 BuildRequires: gobject-introspection-devel
 BuildRequires: vala-tools
 BuildRequires: valgrind-devel
-BuildRoot:     %{_tmppath}/%{name}-%{version}-root
 
 %description
 A small little library that was created by pulling out some comon code out of indicator-applet.
@@ -111,17 +110,38 @@ Requires:      gtk-doc
 %description apidocs
 %{name} API documentation.
 
+%debug_package
+
 %prep
 %setup -q
-
-%build
-%configure --enable-introspection
-%make -j1
+# don't treat warnings as errors
+sed -i 's/-Werror//' libdbusmenu-*/Makefile.{am,in}
 
 tar xf %{SOURCE0}
 mv %{name}-%{version} gtk2
 cd gtk2
-%configure --with-gtk=2 --enable-introspection
+sed -i 's/-Werror//' libdbusmenu-*/Makefile.{am,in}
+
+%build
+export HAVE_VALGRIND_TRUE=''
+export HAVE_VALGRIND_FALSE='#'
+  
+%configure \
+   --enable-introspection \
+   --disable-dumper \
+   --disable-static \
+   --disable-tests
+
+%make -j1
+
+cd gtk2
+%configure \
+   --with-gtk=2 \
+   --enable-introspection \
+   --disable-dumper \
+   --disable-static \
+   --disable-tests
+
 %make -j1
 cd ..
 
@@ -159,28 +179,24 @@ rm -fr %{buildroot}/usr/share/doc/libdbusmenu
 %files devel
 %defattr(-,root,root)
 %{_includedir}/libdbusmenu-*/libdbusmenu-glib
-%{_libdir}/libdbusmenu-glib.a
 %{_libdir}/libdbusmenu-glib.la
 %{_libdir}/libdbusmenu-glib.so
 %{_libdir}/pkgconfig/dbusmenu-glib-0.4.pc
-#
 %{_libexecdir}/dbusmenu-bench
-%{_libexecdir}/dbusmenu-dumper
-%{_libexecdir}/dbusmenu-testapp
 
-%files jsonloader
-%defattr(-,root,root)
-%{_libdir}/libdbusmenu-jsonloader.so.*
-%{_datadir}/libdbusmenu/json/test-gtk-label.json
+#%files jsonloader
+#%defattr(-,root,root)
+#%{_libdir}/libdbusmenu-jsonloader.so.*
+#%{_datadir}/libdbusmenu/json/test-gtk-label.json
 
-%files jsonloader-devel
-%defattr(-,root,root)
-%dir %{_includedir}/libdbusmenu-glib-0.4/libdbusmenu-jsonloader
-%{_includedir}/libdbusmenu-glib-0.4/libdbusmenu-jsonloader/*
-%{_libdir}/libdbusmenu-jsonloader.a
-%{_libdir}/libdbusmenu-jsonloader.la
-%{_libdir}/libdbusmenu-jsonloader.so
-%{_libdir}/pkgconfig/dbusmenu-jsonloader-0.4.pc
+#%files jsonloader-devel
+#%defattr(-,root,root)
+#%dir %{_includedir}/libdbusmenu-glib-0.4/libdbusmenu-jsonloader
+#%{_includedir}/libdbusmenu-glib-0.4/libdbusmenu-jsonloader/*
+#%{_libdir}/libdbusmenu-jsonloader.a
+#%{_libdir}/libdbusmenu-jsonloader.la
+#%{_libdir}/libdbusmenu-jsonloader.so
+#%{_libdir}/pkgconfig/dbusmenu-jsonloader-0.4.pc
 
 %files gtk
 %defattr(-,root,root)
@@ -192,7 +208,6 @@ rm -fr %{buildroot}/usr/share/doc/libdbusmenu
 %dir %{_includedir}/libdbusmenu-gtk-0.4
 %dir %{_includedir}/libdbusmenu-gtk-0.4/libdbusmenu-gtk
 %{_includedir}/libdbusmenu-gtk-0.4/libdbusmenu-gtk/*.h
-%{_libdir}/libdbusmenu-gtk.a
 %{_libdir}/libdbusmenu-gtk.la
 %{_libdir}/libdbusmenu-gtk.so
 %{_libdir}/pkgconfig/dbusmenu-gtk-0.4.pc
@@ -209,7 +224,6 @@ rm -fr %{buildroot}/usr/share/doc/libdbusmenu
 %dir %{_includedir}/libdbusmenu-gtk3-0.4
 %dir %{_includedir}/libdbusmenu-gtk3-0.4/libdbusmenu-gtk
 %{_includedir}/libdbusmenu-gtk3-0.4/libdbusmenu-gtk/*.h
-%{_libdir}/libdbusmenu-gtk3.a
 %{_libdir}/libdbusmenu-gtk3.la
 %{_libdir}/libdbusmenu-gtk3.so
 %{_libdir}/pkgconfig/dbusmenu-gtk3-0.4.pc
@@ -224,6 +238,9 @@ rm -fr %{buildroot}/usr/share/doc/libdbusmenu
 %{_datadir}/gtk-doc/html/libdbusmenu-gtk/*
 
 %changelog
+* Fri Apr 16 2021 Silvan Calarco <silvan.calarco@mambasoft.it> 16.04.0-3mamba
+- rebuilt with debug package and build fixes
+
 * Tue Mar 15 2016 Silvan Calarco <silvan.calarco@mambasoft.it> 16.04.0-2mamba
 - add gtk2 version