diff --git a/.cvsignore b/.cvsignore
index 454dd1e..8a13509 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-metacity-2.3.987.tar.gz
+metacity-2.4.0.91.tar.bz2
diff --git a/metacity.spec b/metacity.spec
index ac1c84f..c02484f 100644
--- a/metacity.spec
+++ b/metacity.spec
@@ -1,9 +1,11 @@
+%define gettext_package metacity
+
 Summary: Metacity window manager
 Name: metacity
-Version: 2.3.987
+Version: 2.4.0.91
 Release: 1
 URL: http://people.redhat.com/~hp/metacity/
-Source0: %{name}-%{version}.tar.gz
+Source0: %{name}-%{version}.tar.bz2
 License: GPL
 Group: User Interface/Desktops
 BuildRoot: %{_tmppath}/%{name}-root
@@ -11,9 +13,14 @@ BuildRequires: gtk2-devel >= 2.0.3-3
 BuildRequires: pango-devel >= 1.0.99
 BuildRequires: fontconfig
 BuildRequires: Xft
-BuildRequires: GConf2-devel >= 1.1.11
+BuildRequires: GConf2-devel >= 1.2.0
+BuildRequires: desktop-file-utils >= 0.3
+BuildRequires: libglade2-devel >= 2.0.0
+
+Requires: redhat-artwork >= 0.27
 
 Patch0: metacity-2.3.987-default-theme.patch
+Patch1: metacity-2.3.987.92-system-font.patch
 
 %description
 
@@ -24,6 +31,7 @@ GNOME 2.
 %setup -q
 
 %patch0 -p1 -b .default-theme
+%patch1 -p1 -b .system-font
 
 %build
 %configure
@@ -36,6 +44,14 @@ export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1
 %makeinstall
 unset GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL
 
+desktop-file-install --vendor gnome --delete-original                   \
+  --dir $RPM_BUILD_ROOT%{_datadir}/control-center-2.0/capplets          \
+  --add-only-show-in GNOME                                              \
+  --add-category X-Red-Hat-Base                                         \
+  $RPM_BUILD_ROOT%{_datadir}/control-center-2.0/capplets/*
+
+%find_lang %{gettext_package}
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -47,7 +63,7 @@ for S in $SCHEMAS; do
   gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/$S > /dev/null
 done
 
-%files
+%files -f %{gettext_package}.lang
 %defattr(-,root,root)
 %doc README AUTHORS COPYING NEWS HACKING theme-format.txt
 %{_bindir}/*
@@ -55,10 +71,54 @@ done
 %{_datadir}/gnome/wm-properties/metacity.desktop
 %{_sysconfdir}/gconf/schemas/*.schemas
 %{_datadir}/metacity
+%{_datadir}/themes
 %{_datadir}/pixmaps
 %{_datadir}/control-center-2.0
 
 %changelog
+* Thu Aug 15 2002 Havoc Pennington <hp@redhat.com>
+- 2.4.0.91 with raise/lower keybindings for msf, fixes to fullscreen
+  more apps that probably intend to be, fix for changing number of
+  workspaces, fix for moving windows in multihead
+
+* Tue Aug 13 2002 Havoc Pennington <hp@redhat.com>
+- update build requires
+
+* Mon Aug 12 2002 Havoc Pennington <hp@redhat.com>
+- upgrade to cvs snap 2.4.0.90 with pile of bugfixes from 
+  this weekend
+- change default theme to bluecurve and require new redhat-artwork
+
+* Tue Aug  6 2002 Havoc Pennington <hp@redhat.com>
+- 2.4.0
+- themes are moved, require appropriate redhat-artwork
+
+* Thu Aug  1 2002 Havoc Pennington <hp@redhat.com>
+- munge the desktop file to be in toplevel menus and 
+  not show in KDE
+
+* Tue Jul 23 2002 Havoc Pennington <hp@redhat.com>
+- don't use system font by default as metacity's 
+  font is now in the system font dialog
+
+* Tue Jul 23 2002 Havoc Pennington <hp@redhat.com>
+- 2.3.987.92 cvs snap
+
+* Fri Jul 12 2002 Havoc Pennington <hp@redhat.com>
+- 2.3.987.91 cvs snap
+
+* Mon Jun 24 2002 Havoc Pennington <hp@redhat.com>
+- 2.3.987.90 cvs snap
+
+* Fri Jun 21 2002 Tim Powers <timp@redhat.com>
+- automated rebuild
+
+* Sun Jun 16 2002 Havoc Pennington <hp@redhat.com>
+- rebuild for new libraries
+
+* Mon Jun 10 2002 Havoc Pennington <hp@redhat.com>
+- rebuild in different environment
+
 * Mon Jun 10 2002 Havoc Pennington <hp@redhat.com>
 - 2.3.987
 - default to redhat theme
diff --git a/sources b/sources
index 190242e..24f6a47 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-f13b9484893cdf0e0716c6becde8cdaf  metacity-2.3.987.tar.gz
+77eeb05cefac1e298f314c8a67ba1bde  metacity-2.4.0.91.tar.bz2