diff --git a/packages/x11/driver/xf86-video-fglrx/install b/packages/x11/driver/xf86-video-fglrx/install
index 936972d4f8..a68e3d7a9c 100755
--- a/packages/x11/driver/xf86-video-fglrx/install
+++ b/packages/x11/driver/xf86-video-fglrx/install
@@ -53,7 +53,8 @@ mkdir -p $INSTALL/$XORG_PATH_MODULES/drivers
   cp -P $PKG_BUILD/$BASEDIR/usr/X11R6/$LIBDIR/modules/drivers/*_drv.so $INSTALL/$XORG_PATH_MODULES/drivers
 
 mkdir -p $INSTALL/$XORG_PATH_MODULES/extensions/fglrx
-  cp -P $PKG_BUILD/$BASEDIR/usr/X11R6/$LIBDIR/modules/extensions/fglrx/*.so $INSTALL/$XORG_PATH_MODULES/extensions/fglrx
+  # rename to not conflicting with Mesa libGL.so
+  cp -P $PKG_BUILD/$BASEDIR/usr/X11R6/$LIBDIR/modules/extensions/fglrx/fglrx-libglx.so $INSTALL/$XORG_PATH_MODULES/extensions/libglx_fglrx.so
 
 mkdir -p $INSTALL/$XORG_PATH_MODULES/linux
   cp -P $PKG_BUILD/$BASEDIR/usr/X11R6/$LIBDIR/modules/linux/*.so $INSTALL/$XORG_PATH_MODULES/linux
@@ -61,21 +62,22 @@ mkdir -p $INSTALL/$XORG_PATH_MODULES/linux
 mkdir -p $INSTALL/etc/X11
   cp $PKG_DIR/config/*.conf $INSTALL/etc/X11
 
+mkdir -p $INSTALL/etc/ati
+  cp $PKG_BUILD/common/etc/ati/amdpcsdb.default $INSTALL/etc/ati
+
 # DRI driver
 mkdir -p $INSTALL/usr/lib/dri
   cp $PKG_BUILD/arch/$ARCH/usr/X11R6/$LIBDIR/modules/dri/fglrx_dri.so* $INSTALL/usr/lib/dri
 
-# Ati's libGL has an hardcoded location for DRI modules
-mkdir -p $INSTALL/usr/X11R6/$LIBDIR/modules/
-  ln -sf /usr/lib/dri $INSTALL/usr/X11R6/$LIBDIR/modules/dri
-
 # OpenGL libs
-mkdir -p $INSTALL/usr/lib/fglrx
-  cp $PKG_BUILD/arch/$ARCH/usr/X11R6/$LIBDIR/fglrx/fglrx-libGL.so* $INSTALL/usr/lib/fglrx
+mkdir -p $INSTALL/usr/lib
+  # rename to not conflicting with Mesa libGL.so
+  cp -P $PKG_BUILD/arch/$ARCH/usr/X11R6/$LIBDIR/fglrx/fglrx-libGL.so* $INSTALL/usr/lib/libGL_fglrx.so.1
 
 # System Libs
 mkdir -p $INSTALL/usr/lib
-  cp $PKG_BUILD/arch/$ARCH/usr/$LIBDIR/libati*.so* $INSTALL/usr/lib
+  cp $PKG_BUILD/arch/$ARCH/usr/$LIBDIR/libati*.so $INSTALL/usr/lib
+  cp $PKG_BUILD/arch/$ARCH/usr/$LIBDIR/libatiuki.so* $INSTALL/usr/lib/libatiuki.so.1
   cp $PKG_BUILD/arch/$ARCH/usr/X11R6/$LIBDIR/libati*.so* $INSTALL/usr/lib
   cp $PKG_BUILD/arch/$ARCH/usr/X11R6/$LIBDIR/libfglrx*.so* $INSTALL/usr/lib
 
diff --git a/packages/x11/driver/xf86-video-fglrx/meta b/packages/x11/driver/xf86-video-fglrx/meta
index 113af40387..e69ff80a5a 100644
--- a/packages/x11/driver/xf86-video-fglrx/meta
+++ b/packages/x11/driver/xf86-video-fglrx/meta
@@ -25,8 +25,8 @@ PKG_ARCH="i386 x86_64"
 PKG_LICENSE="nonfree"
 PKG_SITE="http://www.ati.com/"
 PKG_URL="http://www2.ati.com/drivers/linux/ati-driver-installer-`echo $PKG_VERSION | sed 's/\./-/'`-x86.x86_64.run"
-PKG_DEPENDS="linux"
-PKG_BUILD_DEPENDS="toolchain util-macros libX11"
+PKG_DEPENDS="linux libX11 libXinerama libXcomposite"
+PKG_BUILD_DEPENDS="toolchain util-macros libX11 libXinerama libXcomposite"
 PKG_PRIORITY="optional"
 PKG_SECTION="x11/driver"
 PKG_SHORTDESC="xf86-video-fglrx: ATI binary Xorg driver"