diff --git a/0001-startx-Pass-nolisten-tcp-by-default.patch b/0001-startx-Pass-nolisten-tcp-by-default.patch
deleted file mode 100644
index 3ad2e13..0000000
--- a/0001-startx-Pass-nolisten-tcp-by-default.patch
+++ /dev/null
@@ -1,73 +0,0 @@
-From a750c23c155f889cbb29a3c879b1e19f2707a823 Mon Sep 17 00:00:00 2001
-From: Hans de Goede <hdegoede@redhat.com>
-Date: Thu, 11 Sep 2014 18:02:24 +0200
-Subject: [PATCH xinit] startx: Pass "-nolisten tcp" by default
-
-Having servers started by startx listen on tcp by default is not a good idea
-in this time and age. Pass "-nolisten tcp" by default, and add a special
--listen server option which can be used to disable this new default behavior.
-
-Signed-off-by: Hans de Goede <hdegoede@redhat.com>
----
- man/startx.man | 7 +++++++
- startx.cpp     | 5 +++++
- 2 files changed, 12 insertions(+)
-
-diff --git a/man/startx.man b/man/startx.man
-index 0405be0..fc2cbc3 100644
---- a/man/startx.man
-+++ b/man/startx.man
-@@ -39,6 +39,8 @@ startx \- initialize an X session
- .I server
- ] [
- .I display
-+] [
-+.I -listen
- ]
- .I options
- \&.\|.\|. ]
-@@ -56,6 +58,11 @@ command are used to start a client in the same manner as
- The special argument
- .RB '--'
- marks the end of client arguments and the beginning of server options.
-+By default startx passes
-+.RB '-nolisten\ tcp'
-+to the server, the special server option
-+.RB '-listen'
-+can be used to stop startx from doing this.
- It may be convenient to specify server options with startx to change on a
- per-session basis the
- default color depth, the server's notion of the number of dots-per-inch the
-diff --git a/startx.cpp b/startx.cpp
-index 1c6fce0..8612fa6 100644
---- a/startx.cpp
-+++ b/startx.cpp
-@@ -60,6 +60,7 @@ defaultdisplay=":0"
- clientargs=""
- serverargs=""
- vtarg=""
-+listenarg="-nolisten tcp"
- 
- #ifdef __APPLE__
- 
-@@ -156,6 +157,8 @@ while [ x"$1" != x ]; do
- 	    if [ x"$serverargs" = x ] && @@
- 		 expr "$1" : ':[0-9][0-9]*$' > /dev/null 2>&1; then
- 		display="$1"
-+	    elif [ "$1" = "-listen" ]; then
-+		listenarg=""
- 	    else
- 		serverargs="$serverargs $1"
- 	    fi
-@@ -225,6 +228,8 @@ if [ "$have_vtarg" = "no" ]; then
-     serverargs="$serverargs $vtarg"
- fi
- 
-+serverargs="$serverargs $listenarg"
-+
- XCOMM if no display, use default
- if [ x"$display" = x ]; then
-     display=$defaultdisplay
--- 
-2.1.0
-
diff --git a/xinit-1.3.4-set-XORG_RUN_AS_USER_OK.patch b/xinit-1.3.4-set-XORG_RUN_AS_USER_OK.patch
index cf7b703..8e36e5d 100644
--- a/xinit-1.3.4-set-XORG_RUN_AS_USER_OK.patch
+++ b/xinit-1.3.4-set-XORG_RUN_AS_USER_OK.patch
@@ -12,4 +12,4 @@ diff -up xinit-1.3.4/startx.cpp~ xinit-1.3.4/startx.cpp
 +    export XORG_RUN_AS_USER_OK=1
  fi
  
- serverargs="$serverargs $listenarg"
+ XCOMM if no display, use default
diff --git a/xinitrc-common b/xinitrc-common
index 9554bbb..f4422f1 100644
--- a/xinitrc-common
+++ b/xinitrc-common
@@ -56,7 +56,7 @@ for file in /etc/X11/xinit/xinitrc.d/* ; do
 done
 
 # Prefix launch of session with ssh-agent if available and not already running.
-if [ -z "$SSH_AGENT" ] && [ -z "$SSH_AGENT_PID" ] && [ -x /usr/bin/ssh-agent ]; then
+if [ -z "$SSH_AUTH_SOCK" ] && [ -z "$SSH_AGENT_PID" ] && [ -x /usr/bin/ssh-agent ]; then
     if [ "x$TMPDIR" != "x" ]; then
         SSH_AGENT="/usr/bin/ssh-agent /bin/env TMPDIR=$TMPDIR"
     else
diff --git a/xorg-x11-xinit.spec b/xorg-x11-xinit.spec
index 227943b..02c57b3 100644
--- a/xorg-x11-xinit.spec
+++ b/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.4
-Release:    11%{?dist}
+Release:    12%{?dist}
 License:    MIT
 URL:        http://www.x.org
 
@@ -22,9 +22,6 @@ Source19:   xinit-compat
 
 # Fedora specific patches
 Patch1: xinit-1.0.2-client-session.patch
-# This is the Xserver default starting at xorg-x11-server >= 1.17, drop once
-# we've that version, rhbz#1111684
-Patch2: 0001-startx-Pass-nolisten-tcp-by-default.patch
 # A few fixes submitted upstream, rhbz#1177513, rhbz#1203780
 Patch3: 0001-startx-Pass-keeptty-when-telling-the-server-to-start.patch
 Patch4: 0002-startx-Fix-startx-picking-an-already-used-display-nu.patch
@@ -57,7 +54,6 @@ managers.
 %prep
 %setup -q -n %{pkgname}-%{version}
 %patch1 -p1
-%patch2 -p1
 %patch3 -p1
 %patch4 -p1
 %patch5 -p1
@@ -115,6 +111,11 @@ install -p -m644 -D %{SOURCE18} $RPM_BUILD_ROOT%{_datadir}/xsessions/xinit-compa
 %{_datadir}/xsessions/xinit-compat.desktop
 
 %changelog
+* Mon Aug 29 2016 Hans de Goede <hdegoede@redhat.com> - 1.3.4-12
+- Drop 0001-startx-Pass-nolisten-tcp-by-default.patch this is the
+  server default now
+- Check for SSH_AUTH_SOCK not SSH_AGENT in xinitrc-common (rhbz#1352339)
+
 * Fri Feb 05 2016 Fedora Release Engineering <releng@fedoraproject.org> - 1.3.4-11
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild