diff --git a/packages/x11/xserver/xorg-server/scripts/xorg_start b/packages/x11/xserver/xorg-server/scripts/xorg_start
index cb011c4e1f..8d38758750 100755
--- a/packages/x11/xserver/xorg-server/scripts/xorg_start
+++ b/packages/x11/xserver/xorg-server/scripts/xorg_start
@@ -72,6 +72,9 @@ if [ "$RUNLEVEL" = openelec ]; then
     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 [ "${xorg_driver}" = "fglrx" ]; then
+    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 2ca8124078..ebc76a2736 100644
--- a/packages/x11/xserver/xorg-server/udev.d/97-xorg.rules
+++ b/packages/x11/xserver/xorg-server/udev.d/97-xorg.rules
@@ -27,16 +27,17 @@ GOTO="end_video"
 
 # check for drivers dont use the pci substem
 LABEL="subsystem_drivers"
-KERNEL=="nvidia",  ENV{xorg_driver}="nvidia",  GOTO="start_xorg"
+KERNEL=="fglrx_pci", ENV{xorg_driver}="fglrx",   GOTO="start_xorg"
+KERNEL=="nvidia",    ENV{xorg_driver}="nvidia",  GOTO="start_xorg"
 GOTO="end_video"
 
 # check for drivers using the pci substem
 LABEL="subsystem_pci"
-DRIVER=="i915",    ENV{xorg_driver}="i915",    GOTO="start_xorg"
-DRIVER=="nouveau", ENV{xorg_driver}="nouveau", GOTO="start_xorg"
-#DRIVER=="nvidia",  ENV{xorg_driver}="nvidia",  GOTO="start_xorg"
-DRIVER=="radeon",  ENV{xorg_driver}="radeon",  GOTO="start_xorg"
-DRIVER=="vmware",  ENV{xorg_driver}="vmware",  GOTO="start_xorg"
+DRIVER=="i915",      ENV{xorg_driver}="i915",    GOTO="start_xorg"
+DRIVER=="nouveau",   ENV{xorg_driver}="nouveau", GOTO="start_xorg"
+#DRIVER=="nvidia",    ENV{xorg_driver}="nvidia",  GOTO="start_xorg"
+DRIVER=="radeon",    ENV{xorg_driver}="radeon",  GOTO="start_xorg"
+DRIVER=="vmware",    ENV{xorg_driver}="vmware",  GOTO="start_xorg"
 GOTO="end_video"
 
 # start Xorg