diff -Nru fglrx-installer-updates-15.200/debian/changelog fglrx-installer-updates-15.200/debian/changelog
--- fglrx-installer-updates-15.200/debian/changelog	2015-08-17 15:02:50.000000000 +0000
+++ fglrx-installer-updates-15.200/debian/changelog	2015-11-09 12:23:15.000000000 +0000
@@ -1,3 +1,12 @@
+fglrx-installer-updates (2:15.200-0ubuntu0.6) trusty-proposed; urgency=medium
+
+  * debian/fglrx.preinst.in:
+    - Remove /etc/ati in the migration from the non -core packages
+      even when the directory is not a symlink (LP: #1511301).
+      Thanks to Kai-Heng Feng for the patch.
+
+ -- Alberto Milone <alberto.milone@canonical.com>  Mon, 09 Nov 2015 13:22:58 +0100
+
 fglrx-installer-updates (2:15.200-0ubuntu0.5) trusty-proposed; urgency=medium
 
   * debian/dkms.conf.in,
diff -Nru fglrx-installer-updates-15.200/debian/fglrx-updates.preinst fglrx-installer-updates-15.200/debian/fglrx-updates.preinst
--- fglrx-installer-updates-15.200/debian/fglrx-updates.preinst	2015-08-17 15:03:05.000000000 +0000
+++ fglrx-installer-updates-15.200/debian/fglrx-updates.preinst	2015-11-09 12:23:24.000000000 +0000
@@ -90,8 +90,9 @@
             # now that we no longer use alternatives for the directory
             echo "Moving ati dir to /etc for the fglrx-core transition"
             cp -RL /etc/ati /etc/ati.dpkg-bak 2>/dev/null || true
-            # Remove the link
-            rm -f /etc/ati 2>/dev/null
+            # Remove the link (or the actual directory from the upstream
+            # driver packages)
+            rm -Rf /etc/ati 2>/dev/null
             # Finally move ati into /etc
             mv /etc/ati.dpkg-bak /etc/ati 2>/dev/null || true
 
diff -Nru fglrx-installer-updates-15.200/debian/fglrx-updates.preinst.in fglrx-installer-updates-15.200/debian/fglrx-updates.preinst.in
--- fglrx-installer-updates-15.200/debian/fglrx-updates.preinst.in	2015-08-17 15:00:12.000000000 +0000
+++ fglrx-installer-updates-15.200/debian/fglrx-updates.preinst.in	2015-11-09 12:22:19.000000000 +0000
@@ -90,8 +90,9 @@
             # now that we no longer use alternatives for the directory
             echo "Moving ati dir to /etc for the fglrx-core transition"
             cp -RL /etc/ati /etc/ati.dpkg-bak 2>/dev/null || true
-            # Remove the link
-            rm -f /etc/ati 2>/dev/null
+            # Remove the link (or the actual directory from the upstream
+            # driver packages)
+            rm -Rf /etc/ati 2>/dev/null
             # Finally move ati into /etc
             mv /etc/ati.dpkg-bak /etc/ati 2>/dev/null || true