diff --git a/metadata/md5-cache/sys-kernel/linux-headers-3.1 b/metadata/md5-cache/sys-kernel/linux-headers-3.4
similarity index 69%
rename from metadata/md5-cache/sys-kernel/linux-headers-3.1
rename to metadata/md5-cache/sys-kernel/linux-headers-3.4
index 8dc8371..5fe5f80 100644
--- a/metadata/md5-cache/sys-kernel/linux-headers-3.1
+++ b/metadata/md5-cache/sys-kernel/linux-headers-3.4
@@ -3,10 +3,10 @@
 DESCRIPTION=Linux system headers
 EAPI=3
 HOMEPAGE=http://www.kernel.org/ http://www.gentoo.org/
-KEYWORDS=alpha amd64 arm hppa ia64 m68k mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux
+KEYWORDS=~alpha amd64 arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RESTRICT=binchecks strip
 SLOT=0
-SRC_URI=mirror://gentoo/gentoo-headers-base-3.1.tar.xz mirror://gentoo/gentoo-headers-3.1-1.tar.xz
+SRC_URI=mirror://gentoo/gentoo-headers-base-3.4.tar.xz mirror://gentoo/gentoo-headers-3.4-1.tar.xz
 _eclasses_=eutils	33ef77a15337022e05342d2c772a7a5a	kernel-2	f6bc76f6aacd763879420dba9fa0168e	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	portability	0be430f759a631e692678ed796e09f5c	toolchain-funcs	6526ac6fc9aedf391efb91fcd75ace68	user	9e552f935106ff0bc92af16da64b4b29	versionator	865bc8b2fc9fcfb6d520bdf5a110f5ed
-_md5_=1659892ff377a78000d7b55dfa54a5e6
+_md5_=e29f313c7bb80ecce7297404fa61b621
diff --git a/sys-kernel/linux-headers/Manifest b/sys-kernel/linux-headers/Manifest
index 4418192..c9be64d 100644
--- a/sys-kernel/linux-headers/Manifest
+++ b/sys-kernel/linux-headers/Manifest
@@ -1,2 +1,2 @@
-DIST gentoo-headers-3.1-1.tar.xz 16000 RMD160 7ca0e0d245d8051cc8f8b568a00c55b03025f939 SHA1 bc57a527f86ab8fc72783808143065e96552d9f8 SHA256 255fd3e2abafcede9d36ae882d3cd06671b2250820caa987640ddea674500cb9
-DIST gentoo-headers-base-3.1.tar.xz 4814816 RMD160 372a0e0fa6dbbc36b91143a1ffc03f843aadff7f SHA1 e0bce0b14ac331f9737c2e4bb61c48fb6ea5f941 SHA256 76bc4baeb1d039a171f6316d3ac6b8f50341937242570988d6705b2d9b02a0c0
+DIST gentoo-headers-3.4-1.tar.xz 3524 RMD160 22c9b3898cfcb56bf4d063c99e6bdb72126d6149 SHA1 48a260d69e4bba5e8205a87ccb32a6f570119ebe SHA256 96575df8c65d749b832880d41db4b694ccaa76a6386eef80e4e9cd123625bfee
+DIST gentoo-headers-base-3.4.tar.xz 5115932 RMD160 886e46aa92181d5804e0117f8bb0a80b3f7ba42c SHA1 63c181ae4139bcf1ce5d5de7981dba4c4a6fdc39 SHA256 c1aceea837dc6c05c869f41897e393cc14ef4b8b3e77440b40ae1684360fc154
diff --git a/sys-kernel/linux-headers/linux-headers-3.1.ebuild b/sys-kernel/linux-headers/linux-headers-3.4.ebuild
similarity index 70%
rename from sys-kernel/linux-headers/linux-headers-3.1.ebuild
rename to sys-kernel/linux-headers/linux-headers-3.4.ebuild
index 83fb6ce..9d72497 100644
--- a/sys-kernel/linux-headers/linux-headers-3.1.ebuild
+++ b/sys-kernel/linux-headers/linux-headers-3.4.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/linux-headers/linux-headers-3.1.ebuild,v 1.1 2011/12/10 08:00:58 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/linux-headers/linux-headers-3.4.ebuild,v 1.1 2012/05/22 03:21:59 vapier Exp $
 
 EAPI="3"
 
@@ -10,10 +10,10 @@
 detect_version
 
 PATCH_VER="1"
-SRC_URI="mirror://gentoo/gentoo-headers-base-${PV}.tar.xz"
-[[ -n ${PATCH_VER} ]] && SRC_URI="${SRC_URI} mirror://gentoo/gentoo-headers-${PV}-${PATCH_VER}.tar.xz"
+SRC_URI="mirror://gentoo/gentoo-headers-base-${PV}.tar.xz
+	${PATCH_VER:+mirror://gentoo/gentoo-headers-${PV}-${PATCH_VER}.tar.xz}"
 
-KEYWORDS="alpha amd64 arm hppa ia64 m68k mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-linux ~x86-linux"
 
 DEPEND="app-arch/xz-utils
 	dev-lang/perl"
@@ -26,7 +26,6 @@
 }
 
 src_prepare() {
-	has x32 $(get_all_abis) || EPATCH_EXCLUDE+=" 90_all_x32-3.1.patch"
 	[[ -n ${PATCH_VER} ]] && EPATCH_SUFFIX="patch" epatch "${WORKDIR}"/${PV}
 }