diff --git a/ChangeLog b/ChangeLog
index c86d749cd..f63834ef6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2008-03-29  Lucas Rocha  <lucasr.at.mundo@gmail.com>
+
+        * src/metacity.desktop.in, src/Makefile.am: make Metacity
+        install its desktop files in the default session directory
+        as required by the new gnome-session.  (Closes #525051.)
+
 2008-03-29  Thomas Thurman  <tthurman@gnome.org>
 
         * src/ui/preview-widget.c (meta_preview_get_clip_region):
diff --git a/src/Makefile.am b/src/Makefile.am
index 32e23a98f..4bd0dc452 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -149,6 +149,7 @@ desktopfilesdir=$(datadir)/gnome/wm-properties
 desktopfiles_in_files=metacity.desktop.in
 desktopfiles_files=$(desktopfiles_in_files:.desktop.in=.desktop)
 desktopfiles_DATA = $(desktopfiles_files)
+
 @INTLTOOL_DESKTOP_RULE@
 
 schemadir   = @GCONF_SCHEMA_FILE_DIR@
@@ -170,6 +171,14 @@ else
 install-data-local:
 endif
 
+sessiondir = $(datadir)/gnome/default-session;
+
+install-data-hook:
+	if test -z "$(sessiondir)" ; then \
+	       $(MKDIR_P) $(sessiondir) \
+	fi
+	$(LN_S) -f $(desktopfilesdir)/$(desktopfiles_DATA) $(sessiondir)
+
 IMAGES=default_icon.png stock_maximize.png stock_minimize.png stock_delete.png
 VARIABLES=default_icon_data $(srcdir)/default_icon.png \
           stock_maximize_data $(srcdir)/stock_maximize.png \
diff --git a/src/metacity.desktop.in b/src/metacity.desktop.in
index 2b131c9d8..47045f015 100644
--- a/src/metacity.desktop.in
+++ b/src/metacity.desktop.in
@@ -1,4 +1,5 @@
 [Desktop Entry]
+Type=Application
 Encoding=UTF-8
 _Name=Metacity
 Exec=metacity
@@ -11,6 +12,9 @@ X-GnomeWMSettingsLibrary=metacity
 X-GNOME-Bugzilla-Bugzilla=GNOME
 X-GNOME-Bugzilla-Product=metacity
 X-GNOME-Bugzilla-Component=general
+X-GNOME-Autostart-Phase=WindowManager
+X-GNOME-Provides=windowmanager
+X-GNOME-Autostart-Notify=true
 
 [Window Manager]
 SessionManaged=true