diff --git a/lxsession-0.4.6.1-support-reboot-shutdown-ltst.patch b/lxsession-0.4.6.1-support-reboot-shutdown-ltst.patch
new file mode 100644
index 0000000..58e2cd2
--- /dev/null
+++ b/lxsession-0.4.6.1-support-reboot-shutdown-ltst.patch
@@ -0,0 +1,28 @@
+From 466982ce65e6d673c54ba7a0546d463da1fe5bfa Mon Sep 17 00:00:00 2001
+From: =?utf8?q?Andrew=20Lee=20(=E6=9D=8E=E5=81=A5=E7=A7=8B)?= <ajqlee@debian.org>
+Date: Fri, 29 Jul 2011 21:11:06 +0800
+Subject: [PATCH] Support reboot and shutdown in LTST client. Thanks Vagrant Cascadian <vagrant@freegeek.org>.
+
+---
+ lxsession-logout/lxsession-logout.c |    4 ++++
+ 1 files changed, 4 insertions(+), 0 deletions(-)
+
+diff --git a/lxsession-logout/lxsession-logout.c b/lxsession-logout/lxsession-logout.c
+index a1c26f4..5bb8add 100644
+--- a/lxsession-logout/lxsession-logout.c
++++ b/lxsession-logout/lxsession-logout.c
+@@ -458,7 +458,11 @@ int main(int argc, char * argv[])
+ 
+     /* LTSP support */
+     if (g_getenv("LTSP_CLIENT"))
++    {
+         handler_context.ltsp = TRUE;
++        handler_context.shutdown_available = TRUE;
++        handler_context.reboot_available = TRUE;
++    }
+ 
+     /* Make the button images accessible. */
+     gtk_icon_theme_append_search_path(gtk_icon_theme_get_default(), PACKAGE_DATA_DIR "/lxsession/images");
+-- 
+1.7.0.1
+
diff --git a/lxsession-0.4.6.1-support-user-switch-gdm3.patch b/lxsession-0.4.6.1-support-user-switch-gdm3.patch
new file mode 100644
index 0000000..a74aa9c
--- /dev/null
+++ b/lxsession-0.4.6.1-support-user-switch-gdm3.patch
@@ -0,0 +1,30 @@
+From a872047b9b04707adb5e26b6e14cc7a1d740421f Mon Sep 17 00:00:00 2001
+From: =?utf8?q?Andrew=20Lee=20(=E6=9D=8E=E5=81=A5=E7=A7=8B)?= <ajqlee@debian.org>
+Date: Fri, 29 Jul 2011 21:09:33 +0800
+Subject: [PATCH] Support user switch with gdm3 in lxsession-logout.
+
+---
+ lxsession-logout/lxsession-logout.c |    7 +++++++
+ 1 files changed, 7 insertions(+), 0 deletions(-)
+
+diff --git a/lxsession-logout/lxsession-logout.c b/lxsession-logout/lxsession-logout.c
+index 86f906a..a1c26f4 100644
+--- a/lxsession-logout/lxsession-logout.c
++++ b/lxsession-logout/lxsession-logout.c
+@@ -442,6 +442,13 @@ int main(int argc, char * argv[])
+         handler_context.switch_user_GDM = TRUE;
+     }
+ 
++    /* If we are under GDM3, its "Switch User" is available. */
++    if (verify_running("gdm3", "gdmflexiserver"))
++    {
++        handler_context.switch_user_available = TRUE;
++        handler_context.switch_user_GDM = TRUE;
++    }
++
+     /* If we are under KDM, its "Switch User" is available. */
+     if (verify_running("kdm", "kdmctl"))
+     {
+-- 
+1.7.0.1
+
diff --git a/lxsession.changes b/lxsession.changes
index 8ae28d0..e524f73 100644
--- a/lxsession.changes
+++ b/lxsession.changes
@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Fri Jul 29 22:35:40 UTC 2011 - andrea@opensuse.org
+
+- added lxsession-0.4.6.1-support-user-switch-gdm3.patch to
+  allow lxsession-logout to work properly with gdm3 (upstream)
+- added lxsession-0.4.6.1-support-reboot-shutdown-ltst.patch to
+  add proper support to ltst clients (upstream) 
+
 -------------------------------------------------------------------
 Fri Jul 29 09:06:25 UTC 2011 - andrea@opensuse.org
 
diff --git a/lxsession.spec b/lxsession.spec
index a1ae071..1eaf269 100644
--- a/lxsession.spec
+++ b/lxsession.spec
@@ -26,6 +26,8 @@ Group:          System/GUI/LXDE
 License:        GPLv2
 Url:            http://www.lxde.org/
 Source0:        %{name}-%{version}.tar.bz2
+Patch0:		%name-0.4.6.1-support-user-switch-gdm3.patch
+Patch1:		%name-0.4.6.1-support-reboot-shutdown-ltst.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 BuildRequires:  dbus-1-glib-devel fdupes gtk2-devel intltool pkg-config
 BuildRequires:  docbook-utils docbook-xsl-stylesheets libxslt
@@ -42,6 +44,8 @@ Authors:
 
 %prep
 %setup -q -n %name-%version
+%patch0 -p1
+%patch1 -p1
 
 %build
 %configure --enable-man