diff --git a/srcpkgs/xinit/patches/dont-use-active-vt.patch b/srcpkgs/xinit/patches/dont-use-active-vt.patch
new file mode 100644
index 00000000000..79ed75c4f7e
--- /dev/null
+++ b/srcpkgs/xinit/patches/dont-use-active-vt.patch
@@ -0,0 +1,24 @@
+Revert this change that was committed to fix an issue with systemd.
+
+We want to keep the original behaviour, i.e use the first unused vt.
+
+--- startx.cpp.orig	2018-03-10 02:46:03.000000000 +0100
++++ startx.cpp	2018-03-12 20:18:16.065493050 +0100
+@@ -200,17 +200,6 @@
+ if [ x"$server" = x ]; then
+     server=$defaultserver
+ 
+-#ifdef __linux__
+-    XCOMM When starting the defaultserver start X on the current tty to avoid
+-    XCOMM the startx session being seen as inactive:
+-    XCOMM "https://bugzilla.redhat.com/show_bug.cgi?id=806491"
+-    tty=$(tty)
+-    if expr "$tty" : '/dev/tty[0-9][0-9]*$' > /dev/null; then
+-        tty_num=$(echo "$tty" | grep -oE '[0-9]+$')
+-        vtarg="vt$tty_num -keeptty"
+-    fi
+-#endif
+-
+     XCOMM For compatibility reasons, only use xserverrc if there were no server command line arguments
+     if [ x"$serverargs" = x -a x"$display" = x ]; then
+ 	if [ -f "$userserverrc" ]; then
diff --git a/srcpkgs/xinit/patches/fs25361.patch b/srcpkgs/xinit/patches/fs25361.patch
new file mode 100644
index 00000000000..644a63f7aed
--- /dev/null
+++ b/srcpkgs/xinit/patches/fs25361.patch
@@ -0,0 +1,14 @@
+--- startx.cpp.orig	2018-03-10 02:46:03.000000000 +0100
++++ startx.cpp	2018-03-12 20:30:43.041201031 +0100
+@@ -296,9 +296,9 @@
+     XCOMM now add the same credentials to the client authority file
+     XCOMM if '$displayname' already exists do not overwrite it as another
+     XCOMM server may need it. Add them to the '$xserverauthfile' instead.
+-    for displayname in $authdisplay $hostname$authdisplay; do
++    for displayname in $authdisplay $hostname/unix$authdisplay; do
+         authcookie=`XAUTH list "$displayname" @@
+-        | sed -n "s/.*$displayname[[:space:]*].*[[:space:]*]//p"` 2>/dev/null;
++        | sed -n "s/.*$displayname\/unix$authdisplay[[:space:]*].*[[:space:]*]//p"` 2>/dev/null;
+         if [ "z${authcookie}" = "z" ] ; then
+             XAUTH -q << EOF 
+ add $displayname . $mcookie
diff --git a/srcpkgs/xinit/template b/srcpkgs/xinit/template
index a9f2b5c39dd..c7b4a8e2530 100644
--- a/srcpkgs/xinit/template
+++ b/srcpkgs/xinit/template
@@ -1,7 +1,7 @@
 # Template build file for 'xinit'.
 pkgname=xinit
 version=1.4.0
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--with-xinitdir=/etc/X11/xinit"
 hostmakedepends="pkg-config"