diff --git a/gnome-authentication-agent.desktop b/gnome-authentication-agent.desktop
new file mode 100644
index 0000000..d1aef5c
--- /dev/null
+++ b/gnome-authentication-agent.desktop
@@ -0,0 +1,12 @@
+[Desktop Entry]
+Name=Authentication Agent
+Comment=PolicyKit Authentication Agent for the GNOME3 fallback session
+Exec=/usr/libexec/polkit-gnome-authentication-agent-1
+Terminal=false
+Type=Application
+Categories=
+NoDisplay=true
+X-Desktop-File-Install-Version=0.18
+OnlyShowIn=GNOME;
+AutostartCondition=GNOME3 is-session gnome-fallback
+
diff --git a/gnome-session.spec b/gnome-session.spec
index a27ee80..4ba670a 100644
--- a/gnome-session.spec
+++ b/gnome-session.spec
@@ -3,10 +3,11 @@
 Summary: GNOME session manager
 Name: gnome-session
 Version: 2.91.90
-Release: 2%{?dist}
+Release: 3%{?dist}
 URL: http://www.gnome.org
 #VCS: git:git://git.gnome.org/gnome-session
 Source0: http://download.gnome.org/sources/gnome-session/2.91/%{name}-%{version}.tar.bz2
+Source1: gnome-authentication-agent.desktop
 Source2: gnome.desktop
 
 License: GPLv2+
@@ -105,13 +106,11 @@ desktop-file-install --vendor gnome --delete-original                   \
   --add-only-show-in GNOME                                              \
   $RPM_BUILD_ROOT%{_datadir}/applications/*
 
-install -Dp -m 644 %{SOURCE2} ${RPM_BUILD_ROOT}%{_datadir}/xsessions/
+mkdir -p $RPM_BUILD_ROOT%{_datadir}/gnome/autostart
 
-rm -f $RPM_BUILD_ROOT%{_datadir}/gnome/autostart/gnome-login-sound.desktop
-rm -f $RPM_BUILD_ROOT%{_datadir}/gnome/shutdown/gnome-logout-sound.sh
-rm -f $RPM_BUILD_ROOT%{_libdir}/gnome-session/helpers/gnome-login-sound
+install -Dp -m 644 %{SOURCE1} ${RPM_BUILD_ROOT}%{_datadir}/gnome/autostart
 
-mkdir -p $RPM_BUILD_ROOT%{_datadir}/gnome/autostart
+install -Dp -m 644 %{SOURCE2} ${RPM_BUILD_ROOT}%{_datadir}/xsessions/
 
 cp -p AUTHORS COPYING NEWS README $RPM_BUILD_ROOT%{_datadir}/doc/%{name}-%{version}
 
@@ -164,6 +163,10 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas || :
 %{_datadir}/glib-2.0/schemas/org.gnome.SessionManager.gschema.xml
 
 %changelog
+* Tue Feb 22 2011 Matthias Clasen <mclasen@redhat.com> 2.91.90-3
+- Install an autostart file for the authentication agent
+  in the fallback session
+
 * Tue Feb 22 2011 Ray Strode <rstrode@redhat.com> 2.91.90-2
 - Fix crashity crash crash