diff --git a/SOURCES/Xclients b/SOURCES/Xclients
index 606d95a..856f179 100755
--- a/SOURCES/Xclients
+++ b/SOURCES/Xclients
@@ -29,7 +29,7 @@ fi
 # now if we can reach here, either no desktop file was present,
 # or the desktop requested is not installed.
 
-if [ -n "$GSESSION" ]; then
+if [ -n "$GSESSION" -a -f /usr/share/xsessions/gnome-classic.desktop ]; then
     # by default, we run GNOME.
     export GNOME_SHELL_SESSION_MODE=classic
     exec "$GSESSION" --session=gnome-classic
diff --git a/SOURCES/xorg-x11-xinit-1.3.2-systemd-logind.patch b/SOURCES/xorg-x11-xinit-1.3.2-systemd-logind.patch
index 85261da..fcfa3ac 100644
--- a/SOURCES/xorg-x11-xinit-1.3.2-systemd-logind.patch
+++ b/SOURCES/xorg-x11-xinit-1.3.2-systemd-logind.patch
@@ -5,11 +5,11 @@ diff -Nur xinit-1.3.2.orig/startx.cpp xinit-1.3.2/startx.cpp
  defaultdisplay=":0"
  clientargs=""
  serverargs=""
-+tty_num=$(tty | grep -oE '[0-9]+$')
++tty_num=$(tty | sed -n 's/.*tty\([0-9]\+\)$/\1/p')
  
  #ifdef __APPLE__
  
-@@ -135,6 +136,15 @@
+@@ -135,6 +136,12 @@
  enable_xauth=1
  #endif
  
@@ -17,9 +17,6 @@ diff -Nur xinit-1.3.2.orig/startx.cpp xinit-1.3.2/startx.cpp
 +    # Specify TTY number directly to avoid recognizing startx session as
 +    # inactive: RHBZ#820675
 +    serverargs=${serverargs}" vt"${tty_num}
-+else
-+    echo "Error getting tty num"
-+    exit 1
 +fi
 +
  XCOMM Automatically determine an unused $DISPLAY
diff --git a/SPECS/xorg-x11-xinit.spec b/SPECS/xorg-x11-xinit.spec
index 7dfc16e..25e382d 100644
--- a/SPECS/xorg-x11-xinit.spec
+++ b/SPECS/xorg-x11-xinit.spec
@@ -3,7 +3,7 @@
 Summary:   X.Org X11 X Window System xinit startup scripts
 Name:      xorg-x11-%{pkgname}
 Version:   1.3.2
-Release:   13%{?dist}
+Release:   14%{?dist}
 License:   MIT
 Group:     User Interface/X
 URL:       http://www.x.org
@@ -118,6 +118,12 @@ install -p -m644 -D %{SOURCE18} $RPM_BUILD_ROOT%{_datadir}/xsessions/xinit-compa
 %{_datadir}/xsessions/xinit-compat.desktop
 
 %changelog
+* Mon Sep  1 2014 Hans de Goede <hdegoede@redhat.com> - 1.3.2-14
+- Xclients: only try to start gnome classic session if installed
+- Resolves: rhbz#1078948
+- startx: Only specify vt argument automatically when run from a vt
+- Resolves: rhbz#1083188
+
 * Mon Mar 10 2014 Adam Jackson <ajax@redhat.com> 1.3.2-13
 - Xclients: Fix --session argument for classic (#1074174)