diff --git a/N_driver-autoconfig.diff b/N_driver-autoconfig.diff
index 65deab7..0280455 100644
--- a/N_driver-autoconfig.diff
+++ b/N_driver-autoconfig.diff
@@ -8,17 +8,7 @@ Index: hw/xfree86/common/xf86pciBus.c
 ===================================================================
 --- hw/xfree86/common/xf86pciBus.c.orig
 +++ hw/xfree86/common/xf86pciBus.c
-@@ -1107,7 +1107,8 @@ videoPtrToDriverList(struct pci_device *
-         driverList[0] = "ast";
-         break;
-     case 0x1002:
--        driverList[0] = "ati";
-+	driverList[0] = "amdgpu";
-+        driverList[1] = "ati";
-         break;
-     case 0x102c:
-         driverList[0] = "chips";
-@@ -1139,6 +1141,13 @@ videoPtrToDriverList(struct pci_device *
+@@ -1185,6 +1185,13 @@ xf86VideoPtrToDriverList(struct pci_devi
          driverList[0] = "neomagic";
          break;
      case 0x10de:
@@ -32,7 +22,7 @@ Index: hw/xfree86/common/xf86pciBus.c
      case 0x12d2:
      {
          int idx = 0;
-@@ -1150,7 +1159,8 @@ videoPtrToDriverList(struct pci_device *
+@@ -1196,7 +1203,8 @@ xf86VideoPtrToDriverList(struct pci_devi
          break;
      }
      case 0x1106:
diff --git a/xorg-x11-server.changes b/xorg-x11-server.changes
index 7011b48..14d9736 100644
--- a/xorg-x11-server.changes
+++ b/xorg-x11-server.changes
@@ -1,3 +1,12 @@
+-------------------------------------------------------------------
+Fri Feb  3 11:40:11 UTC 2017 - sndirsch@suse.com
+
+- N_driver-autoconfig.diff:
+  No longer try to load "amdgpu" DDX by default for all GPUs with
+  ATI vendor ID; this is now handled instead by an "OutputClass" 
+  section via kernel driver match, which has been added as config
+  file to xf86-video-amdgpu driver package (bnc#1023385)
+
 -------------------------------------------------------------------
 Thu Jan 26 15:34:57 UTC 2017 - sndirsch@suse.com