diff --git a/_service b/_service
index b677989..6e6b7c6 100644
--- a/_service
+++ b/_service
@@ -2,7 +2,7 @@
   <service name="tar_scm" mode="disabled">
     <param name="url">https://gitlab.freedesktop.org/xorg/xserver.git</param>
     <param name="scm">git</param>
-    <param name="revision">6b3fafa9</param>
+    <param name="revision">489f4191</param>
     <param name="versionformat">@PARENT_TAG@+@TAG_OFFSET@</param>
     <param name="versionrewrite-pattern">xorgserver(.*)</param>
     <param name="changesgenerate">enable</param>
diff --git a/_servicedata b/_servicedata
index 7e48b00..5acdaf0 100644
--- a/_servicedata
+++ b/_servicedata
@@ -1,4 +1,4 @@
 <servicedata>
 <service name="tar_scm">
                 <param name="url">https://gitlab.freedesktop.org/xorg/xserver.git</param>
-              <param name="changesrevision">6b3fafa9bfa94b9b04a1a44dc52afb7c4bc250ce</param></service></servicedata>
\ No newline at end of file
+              <param name="changesrevision">489f4191f3c881c6c8acce97ec612167a4ae0f33</param></service></servicedata>
\ No newline at end of file
diff --git a/pre_checkin.sh b/pre_checkin.sh
index 682b667..6004cfd 100644
--- a/pre_checkin.sh
+++ b/pre_checkin.sh
@@ -22,14 +22,14 @@ elif [ "$1" == "--verify" ]; then
 else
 	echo "Wrong usage of this script"
 	echo "$0 can be started in two ways:"
-	echo "1: $0 --tar {xorg-server-xxxx.tar.bz2}"
+	echo "1: $0 --tar {xserver-xxxx.tar.xz}"
 	echo "2: $0 --verify {source-folder}"
 	echo "Variant 1 creates the file xorg-server-provides to be included in the src rpm"
 	echo "Variant 2 is being called during build to ensure the ABI provides match the expectations."
 	echo ""
 	echo ""
 	echo "Trying to guess the right tarball"
-	sh $0 --tar xorg-server-*.tar.bz2
+	sh $0 --tar xserver-*.tar.xz
 	echo "... Please verify if the result makes sense"
 	exit 2
 fi
diff --git a/xorg-server-provides b/xorg-server-provides
index 2afd5c0..5274abb 100644
--- a/xorg-server-provides
+++ b/xorg-server-provides
@@ -1,4 +1,4 @@
 Provides: X11_ABI_XINPUT = 24.1
-Provides: X11_ABI_VIDEODRV = 24.0
+Provides: X11_ABI_VIDEODRV = 24.1
 Provides: X11_ABI_ANSIC = 0.4
 Provides: X11_ABI_EXTENSION = 10.0
diff --git a/xorg-x11-server.changes b/xorg-x11-server.changes
index ebf15c6..b0573d2 100644
--- a/xorg-x11-server.changes
+++ b/xorg-x11-server.changes
@@ -1,3 +1,23 @@
+-------------------------------------------------------------------
+Tue Jan 14 12:41:02 UTC 2020 - sndirsch@suse.com
+
+- Update to version 1.20.7+0:
+  * xserver 1.20.7
+  * ospoll: Fix Solaris ports implementation to build on Solaris 11.4
+  * os-support/solaris: Set IOPL for input thread too
+  * Add xf86OSInputThreadInit call from common layer into os-support layer
+  * Add ddxInputThread call from os layer into ddx layer
+  * os-support/solaris: Drop ExtendedEnabled global variable
+  * glamor: Only use dual blending with GLSL >= 1.30
+  * modesetting: Check whether RandR was initialized before calling rrGetScrPriv
+  * Xi: return AlreadyGrabbed for key grabs > 255
+  * xwayland: Do flush GPU work in xwl_present_flush
+  * modesetting: Clear new screen pixmap storage on RandR resize
+  * xfree86/modes: Call xf86RotateRedisplay from xf86CrtcRotate
+  * modesetting: Call glamor_finish from drmmode_crtc_set_mode
+  * modesetting: Use EGL_MESA_query_driver to select DRI driver if possible
+  * glamor: Add a function to get the driver name via EGL_MESA_query_driver
+
 -------------------------------------------------------------------
 Fri Nov 29 15:21:07 UTC 2019 - Frederic Crozat <fcrozat@suse.com>
 
diff --git a/xorg-x11-server.spec b/xorg-x11-server.spec
index 23db8ad..f6c5a00 100644
--- a/xorg-x11-server.spec
+++ b/xorg-x11-server.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package xorg-x11-server
 #
-# Copyright (c) 2019 SUSE LLC
+# Copyright (c) 2020 SUSE LINUX GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -42,7 +42,7 @@
 %endif
 
 Name:           xorg-x11-server
-Version:        1.20.6+0
+Version:        1.20.7+0
 Release:        0
 URL:            http://xorg.freedesktop.org/
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
diff --git a/xserver-1.20.6+0.tar.xz b/xserver-1.20.6+0.tar.xz
deleted file mode 100644
index 36ee603..0000000
--- a/xserver-1.20.6+0.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:2f6301dbea2e4b20c7869d3261091f3eb578965b9733ef9679fc9cb309e70f73
-size 3108312
diff --git a/xserver-1.20.7+0.tar.xz b/xserver-1.20.7+0.tar.xz
new file mode 100644
index 0000000..2032cd9
--- /dev/null
+++ b/xserver-1.20.7+0.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:784f75143d8d38df280389504ca99c9f69f3db07cce0b0db243e3ec937a0f769
+size 3109232