diff --git a/recipes-graphics/xorg-driver/xf86-video-armsoc-rockchip/20-armsoc.conf b/recipes-graphics/xorg-driver/xf86-video-armsoc-rockchip/20-armsoc.conf
new file mode 100644
index 0000000..80a13bd
--- /dev/null
+++ b/recipes-graphics/xorg-driver/xf86-video-armsoc-rockchip/20-armsoc.conf
@@ -0,0 +1,16 @@
+Section "Device"
+        Identifier      "Mali FBDEV"
+        Driver          "armsoc"
+        Option          "fbdev"                 "/dev/fb0"
+        Option          "Fimg2DExa"             "false"
+        Option          "DRI2"                  "true"
+        Option          "DRI2_PAGE_FLIP"        "false"
+        Option          "DRI2_WAIT_VSYNC"       "true"
+        Option          "SWcursorLCD"           "false"
+EndSection
+
+Section "Screen"
+        Identifier      "DefaultScreen"
+        Device          "Mali FBDEV"
+        DefaultDepth    24
+EndSection
diff --git a/recipes-graphics/xorg-driver/xf86-video-armsoc-rockchip_git.bb b/recipes-graphics/xorg-driver/xf86-video-armsoc-rockchip_git.bb
new file mode 100644
index 0000000..680878d
--- /dev/null
+++ b/recipes-graphics/xorg-driver/xf86-video-armsoc-rockchip_git.bb
@@ -0,0 +1,25 @@
+# Copyright (C) 2015 Romain Perier <romain.perier@gmail.com>
+# Released under the MIT license (see COPYING.MIT for the terms)
+
+require recipes-graphics/xorg-driver/xorg-driver-video.inc
+
+DESCRIPTION = "X.org graphics driver for ARM graphics - Rockchip"
+HOMEPAGE = "https://github.com/mmind/xf86-video-armsoc"
+LICENSE = "GPL-2.0"
+LIC_FILES_CHKSUM = "file://COPYING;md5=10ce5de3b111315ea652a5f74ec0c602"
+
+PE = ""
+PR = "r1"
+PV = "261+git+67d4cff"
+
+RDEPENDS_${PN} += "xserver-xorg-module-exa"
+S = "${WORKDIR}/git"
+SRCREV = "67d4cffe67737458716116498a67546291def000"
+SRC_URI = "git://github.com/mmind/xf86-video-armsoc.git;protocol=http;branch=devel/rockchip \
+	   file://20-armsoc.conf \
+"
+
+do_install_append() {
+	install -d ${D}/etc/X11/xorg.conf.d
+	install -m 644 ${WORKDIR}/20-armsoc.conf ${D}/etc/X11/xorg.conf.d
+}