diff --git a/common/shlibs b/common/shlibs
index 48f6cbea8e..20a43d3905 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -292,6 +292,7 @@ libdrm.so.2 libdrm-2.4.6_1
 libdrm_radeon.so.1 libdrm-2.4.6_1
 libdrm_intel.so.1 libdrm-2.4.6_1
 libdrm_nouveau.so.2 libdrm-2.4.34_1
+libdrm_amdgpu.so.1 libdrm-2.4.64_1
 libkms.so.1 libdrm-2.4.6_1
 libXxf86vm.so.1 libXxf86vm-1.0.2_1
 libXi.so.6 libXi-1.2.1_1
diff --git a/srcpkgs/xf86-video-amdgpu/template b/srcpkgs/xf86-video-amdgpu/template
new file mode 100644
index 0000000000..0ac5bd104b
--- /dev/null
+++ b/srcpkgs/xf86-video-amdgpu/template
@@ -0,0 +1,26 @@
+# Template build file for 'xf86-video-amdgpu'.
+pkgname=xf86-video-amdgpu
+version=0.0.0.0.20150907
+revision=1
+lib32disabled=yes
+only_for_archs="i686 i686-musl x86_64 x86_64-musl"
+build_style=gnu-configure
+hostmakedepends="automake git libtool xorg-util-macros pkg-config"
+makedepends="xf86driproto libudev-devel libpciaccess-devel
+ libdrm-devel pixman-devel MesaLib-devel xorg-server-devel"
+depends="virtual?xserver-abi-video-19_1 mesa-ati-dri"
+replaces="xf86-video-ati>=0"
+short_desc="Xorg AMD Radeon RXXX video driver (amdgpu kernel module)"
+maintainer="Juan RP <xtraeme@voidlinux.eu>"
+homepage="http://xorg.freedesktop.org"
+license="MIT"
+
+do_fetch() {
+	git clone git://anongit.freedesktop.org/xorg/driver/xf86-video-amdgpu $wrksrc
+	cd $wrksrc
+	# latest commit as of 20150907
+	git reset --hard 63948ea091a9b324327ade7ec4fc5d67ca7e6f6f
+}
+pre_configure() {
+	NOCONFIGURE=1 ./autogen.sh
+}