diff --git a/gnome-session.spec b/gnome-session.spec
index efa7226..cd5a2f1 100644
--- a/gnome-session.spec
+++ b/gnome-session.spec
@@ -13,12 +13,11 @@
 Summary: GNOME session manager
 Name: gnome-session
 Version: 2.10.0
-Release: 1
+Release: 2
 URL: http://www.gnome.org
 Source0: ftp://ftp.gnome.org/pub/GNOME/sources/gnome-session/2.7/%{name}-%{version}.tar.bz2
-Source1: Gnome.session
-Source2: redhat-default-session
-Source3: gnome.desktop
+Source1: redhat-default-session
+Source2: gnome.desktop
 License: GPL 
 Group: User Interface/Desktops
 BuildRoot: %{_tmppath}/%{name}-root
@@ -37,8 +36,8 @@ Requires: control-center
 Requires: gnome-volume-manager
 %endif
 
-## we conflict with gdm that contains the GNOME gdm session
-Conflicts: gdm < 1:2.4.0.7-7
+## we conflict with gdm that contains the GNOME gdm xsession
+Conflicts: gdm < 1:2.6.0.8-4
 
 Patch1: gnome-session-2.2.2-icons.patch
 Patch2: gnome-session-2.0.5-login.patch
@@ -104,20 +103,17 @@ desktop-file-install --vendor gnome --delete-original                   \
   --add-category AdvancedSettings                                       \
   $RPM_BUILD_ROOT%{_datadir}/applications/*
 
-./mkinstalldirs $RPM_BUILD_ROOT/etc/X11/gdm/Sessions/
-install -m 755 %{SOURCE1} $RPM_BUILD_ROOT/etc/X11/gdm/Sessions/GNOME
+./mkinstalldirs ${RPM_BUILD_ROOT}%{_datadir}/xsessions/
+install -m 755 %{SOURCE2} ${RPM_BUILD_ROOT}%{_datadir}/xsessions/
 
-./mkinstalldirs $RPM_BUILD_ROOT/etc/X11/dm/Sessions/
-install -m 755 %{SOURCE3} $RPM_BUILD_ROOT/etc/X11/dm/Sessions/
-
-/bin/rm $RPM_BUILD_ROOT%{_datadir}/gnome/default.session
+/bin/rm -f $RPM_BUILD_ROOT%{_datadir}/gnome/default.session
 
 # Bad evilness to remove gnome-volume-manager dependency on s390
 %ifarch s390 s390x
-sed -i -e 's/num_clients=7/num_clients=6/' -e '/^6,.*$/d' %{SOURCE2}
+sed -i -e 's/num_clients=7/num_clients=6/' -e '/^6,.*$/d' %{SOURCE1}
 %endif
 
-install -m 644 %{SOURCE2} $RPM_BUILD_ROOT%{_datadir}/gnome/default.session
+install -m 644 %{SOURCE1} $RPM_BUILD_ROOT%{_datadir}/gnome/default.session
 
 #/bin/rm -r $RPM_BUILD_ROOT/var/scrollkeeper
 
@@ -144,13 +140,15 @@ done
 
 %{_datadir}/gnome
 %{_datadir}/applications
+%{_datadir}/xsessions
 %{_datadir}/man/man*/*
 %{_bindir}/*
 %{_sysconfdir}/gconf/schemas/*.schemas
-%{_sysconfdir}/X11/gdm
-%{_sysconfdir}/X11/dm/Sessions/*
 
 %changelog
+* Thu Apr 18 2005 Ray Strode <rstrode@redhat.com> - 2.10.0-2
+- Install gnome.desktop to /usr/share/xsessions (bug 145791)
+
 * Thu Mar 17 2005 Ray Strode <rstrode@redhat.com> - 2.10.0-1
 - Update to upstream version 2.10.0
 
diff --git a/gnome.desktop b/gnome.desktop
index 6fbde99..f9954eb 100755
--- a/gnome.desktop
+++ b/gnome.desktop
@@ -1,61 +1,132 @@
 [Desktop Entry]
 Encoding=UTF-8
 Name=GNOME
+Name[af]=GNOME
+Name[ar]=جنوم
 Name[az]=GNOME
 Name[be]=GNOME
+Name[bg]=GNOME
+Name[bn]=গুহ্‌নোম
+Name[bs]=GNOME
 Name[ca]=GNOME
 Name[cs]=GNOME
 Name[cy]=GNOME
 Name[da]=Gnome
 Name[de]=GNOME
 Name[el]=GNOME
+Name[en_CA]=GNOME
+Name[en_GB]=GNOME
 Name[es]=GNOME
 Name[et]=GNOME
+Name[eu]=GNOME
 Name[fi]=Gnome
 Name[fr]=GNOME
+Name[ga]=GNOME
+Name[gl]=GNOME
+Name[gu]=જીનોમ
 Name[he]=GNOME
+Name[hi]=गनोम
+Name[hr]=GNOME
 Name[hu]=GNOME
+Name[is]=GNOME
+Name[it]=GNOME
+Name[ja]=GNOME
 Name[ko]=그놈
+Name[lt]=GNOME
+Name[mi]=GNOME
+Name[mk]=GNOME
+Name[mn]=ГНОМЕ
+Name[mr]=जीनोम
 Name[ms]=GNOME
+Name[nb]=GNOME
 Name[nl]=GNOME
+Name[nn]=GNOME
 Name[no]=GNOME
+Name[nso]=GNOME
+Name[pa]=ਗਨੋਮ
 Name[pl]=GNOME
 Name[pt]=GNOME
 Name[pt_BR]=GNOME
+Name[ro]=GNOME
 Name[ru]=GNOME
+Name[sk]=GNOME
 Name[sl]=GNOME
 Name[sq]=GNOME
 Name[sr]=Гном
 Name[sr@Latn]=Gnom
 Name[sv]=GNOME
+Name[ta]=GNOME
+Name[th]=GNOME
+Name[tr]=GNOME
+Name[uk]=GNOME
+Name[vi]=GNOME
+Name[wa]=GNOME
 Name[zh_CN]=GNOME
+Name[zh_TW]=GNOME
+Name[zu]=GNOME
 Comment=This session logs you into GNOME
-Comment[az]=Bu iclas sizi GNOME'a daxil edəcək
+Comment[af]=Hierdie sessie laat jou aanmeld by GNOME
+Comment[ar]=تسجلك هذه الجلسة في جنوم
+Comment[az]=Bu iclas sizi GNOME-a daxil edəcəkdir
 Comment[be]=Гэтая сэсыя завядзе вас у GNOME
-Comment[ca]=Aquesta sessió entra en GNOME
+Comment[bg]=Тази сесия включва GNOME
+Comment[bn]=এই সেশনে আপনি গুহ্‌নোমে লগিন করবেন
+Comment[bs]=Ova sesija Vas prijavljuje u GNOME
+Comment[ca]=Aquesta sessió entra al GNOME
 Comment[cs]=Toto sezení vás přihlásí do GNOME
 Comment[cy]=Mae'r sesiwn hwn yn eich mewngofnodi i GNOME
 Comment[da]=Denne session logger dig på Gnome
 Comment[de]=Diese Sitzung meldet Sie an GNOME an
 Comment[el]=Αυτή η συνεδρία σας εισάγει στο GNOME
+Comment[en_CA]=This session logs you into GNOME
+Comment[en_GB]=This session logs you into GNOME
 Comment[es]=Con esta sesión accede a GNOME
+Comment[et]=See seanss logib sing GNOME keskkonda
+Comment[eu]=Saio honen bidez GNOMEn sartuko zara
 Comment[fi]=Tämä istunto kirjaa sisään Gnomeen
 Comment[fr]=Cette session vous connectera dans GNOME
+Comment[gl]=Esta sesión entra en GNOME
+Comment[gu]=આ સત્ર તમને જીનોમમાં પ્રવેશ આપશે
 Comment[he]=תצורת הפעלה זו מחברת אותך ל GNOME
+Comment[hi]=यह सत्र गनोम में लॉगइन होगा
+Comment[hr]=Ova sesija vas prijavljuje na GNOMEa
+Comment[hu]=Ez a környezet a GNOME-ba jelentkezteti be
+Comment[id]=Pada sesi ini Anda masuk dengan menggunakan GNOME
+Comment[it]=Sessione di lavoro con GNOME
+Comment[ja]=GNOME セッションにログインします
 Comment[ko]=GNOME세션으로 로그인합니다
+Comment[lt]=Ši sesija prijungia Jus prie GNOME
+Comment[mk]=Оваа сесија ве најавува во GNOME
+Comment[mn]=Энэ суултаар та ГНОМЕ руу нэвтрэнэ.
+Comment[mr]=हे सत्र तुम्हाला जीनोम मधे प्रवेश करू देईल
 Comment[ms]=Sesi ini akan log anda  ke GNOME
+Comment[nb]=Denne sesjonen logger deg inn til GNOME
 Comment[nl]=Deze sessie meldt u aan bij GNOME
+Comment[nn]=Denne økta loggar på GNOME
 Comment[no]=Denne sesjonen logger deg inn til GNOME
+Comment[nso]=Lenaneo le le go tsentšha go GNOME
+Comment[pa]=ਇਹ ਅਜਲਾਸ ਤੁਹਾਨੂੰ ਗਨੋਮ ਵਿੱਚ ਲੈ ਜਾਏਗਾ
 Comment[pl]=Sesja logowania do GNOME
-Comment[pt]=Esta sessão inicia-o no GNOME
-Comment[pt_BR]=Logar no ambiente GNOME
+Comment[pt]=Inicia uma sessão no GNOME
+Comment[pt_BR]=Inicia uma sessão no GNOME
+Comment[ro]=Această sesiune vă va autentifica în GNOME
+Comment[ru]=Начать сеанс GNOME
+Comment[sk]=Toto sedenie vás prihlási do prostredia GNOME
 Comment[sl]=Ta seja vas prijavi v GNOMe
 Comment[sq]=Kjo seancë do t'ju fusë në GNOME
 Comment[sr]=Ова сесија вас пријављује на Гнома
 Comment[sr@Latn]=Ova sesija vas prijavljuje na Gnoma
 Comment[sv]=Denna session loggar in dig i GNOME
+Comment[ta]=இந்த அமர்வு GNOMEவில் உங்களை நுழைக்கும்
+Comment[th]=วาระนี้จะนำคุณเข้าสู่ GNOME
+Comment[tr]=Bu oturum ile GNOME'a giriş yaparsınız
+Comment[uk]=Почати сеанс GNOME
+Comment[vi]=Phiên làm việc này đăng nhập bạn vào GNOME
 Comment[zh_CN]=此会话使您登录到 GNOME
+Comment[zh_TW]=選取這個作業階段後會進入 GNOME 環境
+Comment[zu]=Lenhlanganiso ikungenisa kwiGNOME
 Exec=gnome-session
+TryExec=gnome-session
 # no icon yet, only the top three are currently used
 Icon=
 Type=Application