diff --git a/srcpkgs/catalyst/template b/srcpkgs/catalyst/template
index c1a74cfc2b..39c16d4d1e 100644
--- a/srcpkgs/catalyst/template
+++ b/srcpkgs/catalyst/template
@@ -1,9 +1,10 @@
 # Template file for 'catalyst'
 _desc="AMD catalyst driver for Linux"
+_distver="14.12"
 
 pkgname=catalyst
-version=14.201
-revision=2
+version=14.501.1003
+revision=1
 maintainer="Juan RP <xtraeme@gmail.com>"
 license="Propietary AMD license"
 homepage="http://www.amd.com"
@@ -17,10 +18,13 @@ replaces="libGL>=0"
 short_desc="${_desc} - Libraries and Utilities"
 repository="nonfree"
 create_wrksrc=yes
+build_wrksrc="fglrx-${version}"
 
-update_pkgname="fglrx-installer"
-distfiles="http://archive.ubuntu.com/ubuntu/pool/restricted/f/fglrx-installer/fglrx-installer_${version}.orig.tar.gz"
-checksum=b9064fb5e15c0094162c18d0db9135c061d0e1fde31b2e63de5d3cd455a19e40
+XBPS_FETCH_CMD="wget --referer='http://support.amd.com/en-us/download/desktop?os=Linux+x86' "
+
+update_pkgname="amd-catalyst-omega"
+distfiles="http://www2.ati.com/drivers/linux/amd-catalyst-omega-${_distver}-linux-run-installers.zip"
+checksum=68669836f20ad4351e08b13c5766c6b2ffc6b8cd2a37e9baf55779da32d3a249
 
 if [ "$XBPS_MACHINE" = "i686" ]; then
 	_ARCHDIR="x86"
@@ -30,7 +34,13 @@ elif [ "$XBPS_MACHINE" = "x86_64" ]; then
 	_ARCHXPIC="_64a"
 fi
 
+do_build() {
+	chmod 755 *.run
+	./amd-driver-*.run --extract fglrx
+}
 do_install() {
+	cd fglrx
+
 	install -dm755 ${DESTDIR}/usr/{bin,sbin}
 	install -dm755 ${DESTDIR}/usr/lib/{dri,xorg/modules/{drivers,extensions/fglrx,linux},systemd/system}
 	install -dm755 ${DESTDIR}/usr/include/GL
@@ -38,25 +48,25 @@ do_install() {
 	install -dm755 ${DESTDIR}/usr/share/{applications,ati/amdcccle,man/man8,pixmaps}
   
 	# binaries
-	install -m755 usr/sbin/* ${DESTDIR}/usr/sbin/
-	install -m755 usr/X11R6/bin/* ${DESTDIR}/usr/bin/
+	install -m755 common/usr/sbin/* ${DESTDIR}/usr/sbin/
+	install -m755 common/usr/X11R6/bin/* ${DESTDIR}/usr/bin/
 	install -m755 arch/${_ARCHDIR}/usr/sbin/* ${DESTDIR}/usr/sbin/
 	install -m755 arch/${_ARCHDIR}/usr/X11R6/bin/* ${DESTDIR}/usr/bin/
 
 	# headers
-	install -m644 usr/include/GL/* ${DESTDIR}/usr/include/GL/
+	install -m644 common/usr/include/GL/* ${DESTDIR}/usr/include/GL/
 
 	# xorg/dri/gl/... drivers
-	cd xpic${_ARCHXPIC}/usr/X11R6/lib${_ARCHLIB}/modules
+	pushd xpic${_ARCHXPIC}/usr/X11R6/lib${_ARCHLIB}/modules
 	install -m755 *.so ${DESTDIR}/usr/lib/xorg/modules/
 	install -m755 drivers/*.so ${DESTDIR}/usr/lib/xorg/modules/drivers/
 	install -m755 linux/*.so ${DESTDIR}/usr/lib/xorg/modules/linux/
 	install -m755 extensions/fglrx/fglrx-libglx.so ${DESTDIR}/usr/lib/xorg/modules/extensions
 	ln -sf fglrx-libglx.so ${DESTDIR}/usr/lib/xorg/modules/extensions/libglx.so
 	ln -sf fglrx-libglx.so ${DESTDIR}/usr/lib/xorg/modules/extensions/libglx.so.1
+	popd
 
-	cd ${wrksrc}/arch/${_ARCHDIR}/usr/X11R6/lib${_ARCHLIB}
-
+	pushd arch/${_ARCHDIR}/usr/X11R6/lib${_ARCHLIB}
 	install -m755 modules/dri/fglrx_dri.so ${DESTDIR}/usr/lib/xorg/modules/drivers/
 	ln -sfr ${DESTDIR}/usr/lib/xorg/modules/drivers/fglrx_dri.so ${DESTDIR}/usr/lib/dri/fglrx_dri.so
 	install -m755 fglrx/fglrx-libGL.so.1.2 ${DESTDIR}/usr/lib/
@@ -64,39 +74,38 @@ do_install() {
 	ln -sf fglrx-libGL.so.1.2 ${DESTDIR}/usr/lib/libGL.so.1
 	install -m755 *.so* ${DESTDIR}/usr/lib/
 	install -m644 libAMDXvBA.cap ${DESTDIR}/usr/lib/
+	popd
 
-	cd ${wrksrc}/arch/${_ARCHDIR}/usr/lib${_ARCHLIB}
-
+	pushd arch/${_ARCHDIR}/usr/lib${_ARCHLIB}
 	install -m755 *.so* ${DESTDIR}/usr/lib/
 	# needed symlinks
 	ln -s libatiuki.so.1.0 ${DESTDIR}/usr/lib/libatiuki.so.1
 	ln -s libAMDXvBA.so.1.0 ${DESTDIR}/usr/lib/libAMDXvBA.so.1
 	ln -s libXvBAW.so.1.0 ${DESTDIR}/usr/lib/libXvBAW.so
 	ln -s libfglrx_dm.so.1.0 ${DESTDIR}/usr/lib/libfglrx_dm.so.1
-                                                              
-	# various files 
-	cd ${wrksrc}
+	popd
 
-	install -m644 usr/share/man/man8/* ${DESTDIR}/usr/share/man/man8/
-	install -m644 usr/share/applications/* ${DESTDIR}/usr/share/applications/
-	install -m644 usr/share/icons/* ${DESTDIR}/usr/share/pixmaps/
-	install -m644 usr/share/ati/amdcccle/* ${DESTDIR}/usr/share/ati/amdcccle/
-	install -m644 etc/ati/* ${DESTDIR}/etc/ati/
-	install -m644 usr/share/applications/*.desktop ${DESTDIR}/usr/share/applications/
+	# various files 
+	install -m644 common/usr/share/man/man8/* ${DESTDIR}/usr/share/man/man8/
+	install -m644 common/usr/share/applications/* ${DESTDIR}/usr/share/applications/
+	install -m644 common/usr/share/icons/* ${DESTDIR}/usr/share/pixmaps/
+	install -m644 common/usr/share/ati/amdcccle/* ${DESTDIR}/usr/share/ati/amdcccle/
+	install -m644 common/etc/ati/* ${DESTDIR}/etc/ati/
+	install -m644 common/usr/share/applications/*.desktop ${DESTDIR}/usr/share/applications/
 	# use ACPI example files
-	install -m755 usr/share/doc/fglrx/examples/etc/acpi/*.sh ${DESTDIR}/etc/acpi/
-	install -m644 usr/share/doc/fglrx/examples/etc/acpi/events/* ${DESTDIR}/etc/acpi/events/
+	install -m755 common/usr/share/doc/fglrx/examples/etc/acpi/*.sh ${DESTDIR}/etc/acpi/
+	install -m644 common/usr/share/doc/fglrx/examples/etc/acpi/events/* ${DESTDIR}/etc/acpi/events/
 
 	# provided in catalyst-opencl package
 	rm ${DESTDIR}/usr/lib/lib{amdocl*,OpenCL}.so*
 
 	# we remove the watermark
-	install -m644 etc/ati/* ${DESTDIR}/etc/ati/
+	install -m644 common/etc/ati/* ${DESTDIR}/etc/ati/
 
 	# licenses
-	install -Dm644 ${wrksrc}/usr/share/doc/fglrx/LICENSE.TXT \
+	install -Dm644 common/usr/share/doc/fglrx/LICENSE.TXT \
 		${DESTDIR}/usr/share/licenses/${pkgname}/LICENSE.TXT
-	install -Dm644 ${wrksrc}/usr/share/doc/amdcccle/ccc_copyrights.txt \
+	install -Dm644 common/usr/share/doc/amdcccle/ccc_copyrights.txt \
 		${DESTDIR}/usr/share/licenses/${pkgname}/amdcccle_copyrights.txt
 }
 
@@ -113,8 +122,8 @@ catalyst-dkms_package() {
 		vmkdir usr/lib/modules-load.d
 		vmkdir usr/src/${_fglrx}
 
-		cd ${wrksrc}
-		cp -r lib/modules/fglrx/build_mod/* ${PKGDESTDIR}/usr/src/${_fglrx}
+		cd ${wrksrc}/${build_wrksrc}/fglrx
+		cp -r common/lib/modules/fglrx/build_mod/* ${PKGDESTDIR}/usr/src/${_fglrx}
 
 		vinstall arch/${_ARCHDIR}/lib/modules/fglrx/build_mod/libfglrx_ip.a 644 usr/src/${_fglrx}
 
@@ -127,12 +136,11 @@ catalyst-dkms_package() {
 		echo "fglrx" > ${PKGDESTDIR}/usr/lib/modules-load.d/catalyst.conf
 	}
 }
-
 catalyst-opencl_package() {
 	short_desc="${_desc} - OpenCL implementation"
 	depends="libOpenCL"
 	pkg_install() {
-		cd ${wrksrc}/arch/${_ARCHDIR}
+		cd ${wrksrc}/${build_wrksrc}/fglrx/arch/${_ARCHDIR}
 
 		vmkdir usr/lib
 		vmkdir etc/OpenCL/vendors