diff --git a/x11-drivers/xf86-video-intel/Manifest b/x11-drivers/xf86-video-intel/Manifest
new file mode 100644
index 000000000..5649b53a7
--- /dev/null
+++ b/x11-drivers/xf86-video-intel/Manifest
@@ -0,0 +1,2 @@
+DIST xf86-video-intel-2.20.0.tar.bz2 1552275 SHA256 21949297220ceda32bba430f778c6409002079dc717c7190dbd1062ab4a56783 SHA512 ebd51c6031c62d5ac93b03dde712b9918778e8a58891db0747747124c4956dde19d3bf3659979d7fcc1ff08268f347a162e1ee645151ba8d0b39b5f2f4256feb WHIRLPOOL f76d89456ba833c7e3a0d136fb81af58502368803b554ba413a5029581d074cbf5a3f97c28e77dd3dbe18de0fcd2d47c4f3e01c50b51cd7de050544ae248a590
+EBUILD xf86-video-intel-2.20.0.ebuild 1368 SHA256 e5a3753024787fed056796f71d563dc32082099b61bf30ec3693c84d35362a91 SHA512 214fe3d74846e8b97cd766f2ac79be0251e834ba83859ab75c1e73861a28d58f2b9d35c73b17e49ea079c99573917386a30b90fd54e60330caabfcffade4d3e4 WHIRLPOOL aeb9f7afdc0430166363d1ecb7e6c433a34ced7008af91a3857f1cc652496cb9ea5399a6e5b5212a24e67b64c520396eb3dc2719e89e250939602da4404ff0d2
diff --git a/x11-drivers/xf86-video-intel/xf86-video-intel-2.20.0.ebuild b/x11-drivers/xf86-video-intel/xf86-video-intel-2.20.0.ebuild
new file mode 100644
index 000000000..0a6d950f3
--- /dev/null
+++ b/x11-drivers/xf86-video-intel/xf86-video-intel-2.20.0.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-intel/xf86-video-intel-2.19.0.ebuild,v 1.7 2012/07/04 22:13:45 remi Exp $
+
+EAPI=4
+
+XORG_DRI=dri
+inherit linux-info xorg-2
+
+DESCRIPTION="X.Org driver for Intel cards"
+
+KEYWORDS="amd64 ~ia64 x86 ~amd64-fbsd -x86-fbsd"
+IUSE="glamor sna"
+
+RDEPEND="x11-libs/libXext
+	x11-libs/libXfixes
+	x11-libs/libXvMC
+	>=x11-libs/libxcb-1.5
+	x11-libs/xcb-util
+	>=x11-libs/libdrm-2.4.29[video_cards_intel]
+	glamor? (
+		x11-libs/glamor
+	)
+	sna? (
+		>=x11-base/xorg-server-1.10
+		>=x11-libs/pixman-0.24
+	)"
+DEPEND="${RDEPEND}
+	>=x11-proto/dri2proto-2.6"
+
+pkg_setup() {
+	linux-info_pkg_setup
+	xorg-2_pkg_setup
+	XORG_CONFIGURE_OPTIONS=(
+		$(use_enable dri)
+		$(use_enable glamor)
+		$(use_enable sna)
+		--enable-xvmc
+	)
+}
+
+pkg_postinst() {
+	if linux_config_exists \
+		&& ! linux_chkconfig_present DRM_I915_KMS; then
+		echo
+		ewarn "This driver requires KMS support in your kernel"
+		ewarn "  Device Drivers --->"
+		ewarn "    Graphics support --->"
+		ewarn "      Direct Rendering Manager (XFree86 4.1.0 and higher DRI support)  --->"
+		ewarn "      <*>   Intel 830M, 845G, 852GM, 855GM, 865G (i915 driver)  --->"
+		ewarn "              i915 driver"
+		ewarn "      [*]       Enable modesetting on intel by default"
+		echo
+	fi
+}