diff --git a/N_driver-autoconfig.diff b/N_driver-autoconfig.diff
index fa0e00a..65deab7 100644
--- a/N_driver-autoconfig.diff
+++ b/N_driver-autoconfig.diff
@@ -13,7 +13,7 @@ Index: hw/xfree86/common/xf86pciBus.c
          break;
      case 0x1002:
 -        driverList[0] = "ati";
-+	driverList[0] = "fglrx";
++	driverList[0] = "amdgpu";
 +        driverList[1] = "ati";
          break;
      case 0x102c:
diff --git a/xorg-x11-server.changes b/xorg-x11-server.changes
index 6eae5c2..7011b48 100644
--- a/xorg-x11-server.changes
+++ b/xorg-x11-server.changes
@@ -1,3 +1,12 @@
+-------------------------------------------------------------------
+Thu Jan 26 15:34:57 UTC 2017 - sndirsch@suse.com
+
+- N_driver-autoconfig.diff:
+  FGLRX does not support new x-server. This change fixes bad 
+  behavior(with empty config) when radeon ddx loads with amdgpu
+  kernel module on SI and CIK cards, and x-server cannot start.
+  Radeon ddx with radeon kernel module loads without any problem.
+
 -------------------------------------------------------------------
 Thu Jan 12 20:22:08 UTC 2017 - tobias.johannes.klausmann@mni.thm.de
 
diff --git a/xorg-x11-server.spec b/xorg-x11-server.spec
index 8dafa6e..6a4de03 100644
--- a/xorg-x11-server.spec
+++ b/xorg-x11-server.spec
@@ -47,9 +47,9 @@ Url:            http://xorg.freedesktop.org/
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
 Summary:        X
-# Source URL: http://xorg.freedesktop.org/archive/individual/xserver/
 License:        MIT
 Group:          System/X11/Servers/XF86_4
+# Source URL: http://xorg.freedesktop.org/archive/individual/xserver/
 Source0:        xorg-server-%{version}.tar.bz2
 Source1:        sysconfig.displaymanager.template
 Source2:        README.updates