diff --git a/metacity.spec b/metacity.spec
index dd4186c..bed2973 100644
--- a/metacity.spec
+++ b/metacity.spec
@@ -1,7 +1,6 @@
-%define        gnomegroup  sources
 %define        majver      %(echo %{version} | cut -d. -f 1-2)
 Name:          metacity
-Version:       3.18.3
+Version:       3.20.1
 Release:       1mamba
 Summary:       A minimal X window manager aimed at nontechnical users used by Gnome
 Group:         Graphical Desktop/Libraries/GNOME
@@ -9,36 +8,33 @@ Vendor:        openmamba
 Distribution:  openmamba
 Packager:      Silvan Calarco <silvan.calarco@mambasoft.it>
 URL:           http://www.gnome.org
-Source0:       http://ftp.acc.umu.se/pub/GNOME/%{gnomegroup}/metacity/%{majver}/metacity-%{version}.tar.xz
+Source0:       http://ftp.acc.umu.se/pub/GNOME/sources/metacity/%{majver}/metacity-%{version}.tar.xz
 #ftp://ftp.gnome.org/pub/GNOME/sources/metacity/%{metacity_majver}/metacity-%{version}.tar.bz2
 Source1:       %{name}.png
 Patch:         %{name}-2.22.0-desktop.patch
 License:       GPL
 ## AUTOBUILDREQ-BEGIN
-BuildRequires: GConf-devel >= 2.20.0
 BuildRequires: glibc-devel
+BuildRequires: libICE-devel
+BuildRequires: libSM-devel
+BuildRequires: libX11-devel
+BuildRequires: libXcomposite-devel
+BuildRequires: libXcursor-devel
+BuildRequires: libXdamage-devel
+BuildRequires: libXext-devel
+BuildRequires: libXfixes-devel
+BuildRequires: libXinerama-devel
+BuildRequires: libXrandr-devel
+BuildRequires: libXrender-devel
 BuildRequires: libatk-devel
 BuildRequires: libcairo-devel
 BuildRequires: libcanberra-devel
-BuildRequires: libfontconfig-devel
-BuildRequires: libfreetype-devel
-BuildRequires: libglib-devel >= 2.18.0
-BuildRequires: libgtk-devel >= 2.14.3
-BuildRequires: libICE-devel
+BuildRequires: libgdk-pixbuf-devel
+BuildRequires: libglib-devel
+BuildRequires: libgtk-devel
+BuildRequires: libgtop-devel
 BuildRequires: libpango-devel
-BuildRequires: libSM-devel >= 1.0.3
 BuildRequires: libstartup-notification-devel
-BuildRequires: libX11-devel >= 1.1.3
-BuildRequires: libXcomposite-devel >= 0.4.0
-BuildRequires: libXcursor-devel
-BuildRequires: libXdamage-devel
-BuildRequires: libXext-devel >= 1.0.3
-BuildRequires: libXfixes-devel
-BuildRequires: libXinerama-devel >= 1.0.2
-BuildRequires: libXrandr-devel
-BuildRequires: libXrender-devel >= 0.9.4
-BuildRequires: libz-devel
-BuildRequires: ORBit2-devel
 ## AUTOBUILDREQ-END
 BuildRequires: zenity
 BuildRequires: itstool
@@ -83,35 +79,31 @@ install -m 644 %{S:1} %{buildroot}%{_datadir}/pixmaps/%{name}.png
 %{_bindir}/metacity-message
 %{_bindir}/metacity-theme-viewer
 %{_bindir}/metacity-window-demo
-%{_libdir}/libmetacity-private.so.*
+%{_libdir}/libmetacity.so.*
 %{_datadir}/applications/metacity.desktop
-%{_datadir}/GConf/gsettings/metacity-schemas.convert
+%{_datadir}/glib-2.0/schemas/org.gnome.metacity.*.gschema.xml
 %{_datadir}/glib-2.0/schemas/org.gnome.metacity.gschema.xml
-%{_datadir}/help/C/creating-metacity-themes/index.docbook
-%lang(de) %{_datadir}/help/de/creating-metacity-themes/index.docbook
-%{_datadir}/gnome/wm-properties/metacity-wm.desktop
 %{_datadir}/gnome-control-center/keybindings/50-metacity-*.xml
 %{_datadir}/metacity/icons/metacity-window-demo.png
 %{_datadir}/pixmaps/%{name}.png
-%{_datadir}/themes/*
-%{_mandir}/man1/metacity.1.gz
-%{_mandir}/man1/metacity-message.1.gz
-%{_mandir}/man1/metacity-theme-viewer.1.gz
-%{_mandir}/man1/metacity-window-demo.1.gz
+%{_mandir}/man1/metacity*.1*
 %doc AUTHORS COPYING
 
 %files devel
 %defattr(-,root,root)
-%{_libdir}/libmetacity-private.a
-%{_libdir}/libmetacity-private.la
-%{_libdir}/libmetacity-private.so
+%{_libdir}/libmetacity.a
+%{_libdir}/libmetacity.la
+%{_libdir}/libmetacity.so
 %dir %{_includedir}/metacity
-%dir %{_includedir}/metacity/metacity-private
-%{_includedir}/metacity/metacity-private/*.h
+%dir %{_includedir}/metacity/libmetacity
+%{_includedir}/metacity/libmetacity/*.h
 %{_libdir}/pkgconfig/*.pc
 %doc ChangeLog NEWS README
 
 %changelog
+* Mon Jun 27 2016 Silvan Calarco <silvan.calarco@mambasoft.it> 3.20.1-1mamba
+- update to 3.20.1
+
 * Sat Apr 09 2016 Automatic Build System <autodist@mambasoft.it> 3.18.3-1mamba
 - automatic version update by autodist