diff --git a/packages/x11/xserver/xorg-server/scripts/xorg-configure b/packages/x11/xserver/xorg-server/scripts/xorg-configure
index 9150f048c1..8d6796ad0b 100755
--- a/packages/x11/xserver/xorg-server/scripts/xorg-configure
+++ b/packages/x11/xserver/xorg-server/scripts/xorg-configure
@@ -69,14 +69,6 @@ logger -t Xorg "### creating needed directories and symlinks ###"
     ln -sf /usr/lib/libGL_nvidia.so.1 /var/lib/libGL.so
     ln -sf /usr/lib/xorg/modules/extensions/libglx_nvidia.so /var/lib/libglx.so
     XORG_ARGS="$XORG_ARGS -ignoreABI"
-  elif [ "$1" = "fglrx" ]; then
-    ln -sf /usr/lib/fglrx /var/run/fglrx
-    ln -sf /usr/lib/libGL_fglrx.so.1 /var/lib/libGL.so
-    ln -sf /usr/lib/xorg/modules/extensions/libglx_fglrx.so /var/lib/libglx.so
-  elif [ "$1" = "fglrx-legacy" ]; then
-    ln -sf /usr/lib/fglrx-legacy /var/run/fglrx
-    ln -sf /usr/lib/libGL_fglrx.so.1 /var/lib/libGL.so
-    ln -sf /usr/lib/xorg/modules/extensions/libglx_fglrx.so /var/lib/libglx.so
   else
     ln -sf /usr/lib/libGL_mesa.so.1 /var/lib/libGL.so
     ln -sf /usr/lib/xorg/modules/extensions/libglx_mesa.so /var/lib/libglx.so
diff --git a/packages/x11/xserver/xorg-server/udev.d/97-xorg.rules b/packages/x11/xserver/xorg-server/udev.d/97-xorg.rules
index 78a73c1e2c..648c4d13d3 100644
--- a/packages/x11/xserver/xorg-server/udev.d/97-xorg.rules
+++ b/packages/x11/xserver/xorg-server/udev.d/97-xorg.rules
@@ -28,8 +28,6 @@ GOTO="end_video"
 # check for drivers dont use the pci substem
 LABEL="subsystem_drivers"
 KERNEL=="dovefb", ENV{xorg_driver}="dove", TAG+="systemd", ENV{SYSTEMD_WANTS}+="xorg-configure@dove.service"
-KERNEL=="fglrx_pci", ENV{xorg_driver}="fglrx", TAG+="systemd", ENV{SYSTEMD_WANTS}+="xorg-configure@fglrx.service"
-KERNEL=="fglrx_legacy_pci", ENV{xorg_driver}="fglrx-legacy", TAG+="systemd", ENV{SYSTEMD_WANTS}+="xorg-configure@fglrx-legacy.service"
 KERNEL=="nvidia", ENV{xorg_driver}="nvidia", TAG+="systemd", ENV{SYSTEMD_WANTS}+="xorg-configure@nvidia.service"
 KERNEL=="vboxvideo", ENV{xorg_driver}="vboxvideo", TAG+="systemd", ENV{SYSTEMD_WANTS}+="xorg-configure@vboxvideo.service"
 KERNEL=="vmwgfx", ENV{xorg_driver}="vmware", TAG+="systemd", ENV{SYSTEMD_WANTS}+="xorg-configure@vmware.service"