diff --git a/U_modesetting-use-drmmode_bo_import-for-rotate_fb.patch b/U_modesetting-use-drmmode_bo_import-for-rotate_fb.patch
new file mode 100644
index 0000000..cc19a38
--- /dev/null
+++ b/U_modesetting-use-drmmode_bo_import-for-rotate_fb.patch
@@ -0,0 +1,40 @@
+From a85e94a50c94b07574c8701a3ff3c1243f4257f4 Mon Sep 17 00:00:00 2001
+From: Olivier Fourdan <ofourdan@redhat.com>
+Date: Fri, 15 Jun 2018 08:57:12 +0200
+Subject: [PATCH] modesetting: use drmmode_bo_import() for rotate_fb
+
+drmmode_shadow_allocate() still uses drmModeAddFB() which may fail if
+the format is not as expected, preventing from using a rotated output.
+
+Change it to use the new function drmmode_bo_import() which takes care
+of calling the drmModeAddFB2() API.
+
+Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=106715
+Signed-off-by: Olivier Fourdan <ofourdan@redhat.com>
+Tested-by: Tomas Pelka <tpelka@redhat.com>
+Reviewed-by: Lyude Paul <lyude@redhat.com>
+---
+ hw/xfree86/drivers/modesetting/drmmode_display.c | 7 ++-----
+ 1 file changed, 2 insertions(+), 5 deletions(-)
+
+diff --git a/hw/xfree86/drivers/modesetting/drmmode_display.c b/hw/xfree86/drivers/modesetting/drmmode_display.c
+index 859a21a9d..ec11b3f56 100644
+--- a/hw/xfree86/drivers/modesetting/drmmode_display.c
++++ b/hw/xfree86/drivers/modesetting/drmmode_display.c
+@@ -1794,11 +1794,8 @@ drmmode_shadow_allocate(xf86CrtcPtr crtc, int width, int height)
+         return NULL;
+     }
+ 
+-    ret = drmModeAddFB(drmmode->fd, width, height, crtc->scrn->depth,
+-                       drmmode->kbpp,
+-                       drmmode_bo_get_pitch(&drmmode_crtc->rotate_bo),
+-                       drmmode_bo_get_handle(&drmmode_crtc->rotate_bo),
+-                       &drmmode_crtc->rotate_fb_id);
++    ret = drmmode_bo_import(drmmode, &drmmode_crtc->rotate_bo,
++                            &drmmode_crtc->rotate_fb_id);
+ 
+     if (ret) {
+         ErrorF("failed to add rotate fb\n");
+-- 
+2.16.3
+
diff --git a/xorg-x11-server.changes b/xorg-x11-server.changes
index 04fde32..d5abd7e 100644
--- a/xorg-x11-server.changes
+++ b/xorg-x11-server.changes
@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Mon Jul  2 12:46:54 UTC 2018 - sndirsch@suse.com
+
+- U_modesetting-use-drmmode_bo_import-for-rotate_fb.patch
+  * fixes rotation in modesetting driver (regression with
+    xorg-server 1.20.0, fdo#106715)
+  * might also fix boo#1099812 ...
+
 -------------------------------------------------------------------
 Tue Jun 26 07:51:15 UTC 2018 - msrb@suse.com
 
diff --git a/xorg-x11-server.spec b/xorg-x11-server.spec
index 50a0651..4e56f79 100644
--- a/xorg-x11-server.spec
+++ b/xorg-x11-server.spec
@@ -226,6 +226,8 @@ Patch1401:      u_randr-Do-not-crash-if-slave-screen-does-not-have-pro.patch
 Patch1500:      U_Xext-shm-Refuse-to-work-for-remote-clients.patch
 Patch1501:      U_xkb-Fix-heap-overflow-caused-by-optimized-away-min.patch
 
+Patch1600:      U_modesetting-use-drmmode_bo_import-for-rotate_fb.patch
+
 %description
 This package contains the X.Org Server.
 
@@ -368,6 +370,8 @@ sh %{SOURCE92} --verify . %{SOURCE91}
 %patch1500 -p1
 %patch1501 -p1
 
+%patch1600 -p1
+
 %build
 test -e source-file-list || \
     find -L . -type f \! -name '*.orig' \! -path ./source-file-list > \