diff --git a/metadata/md5-cache/sys-apps/grep-2.14 b/metadata/md5-cache/sys-apps/grep-2.14
new file mode 100644
index 0000000..a6dfebb
--- /dev/null
+++ b/metadata/md5-cache/sys-apps/grep-2.14
@@ -0,0 +1,12 @@
+DEFINED_PHASES=configure install
+DEPEND=nls? ( virtual/libintl ) pcre? ( >=dev-libs/libpcre-7.8-r1 ) virtual/libiconv nls? ( sys-devel/gettext )
+DESCRIPTION=GNU regular expression matcher
+EAPI=3
+HOMEPAGE=http://www.gnu.org/software/grep/
+IUSE=nls pcre
+KEYWORDS=alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=GPL-3
+RDEPEND=nls? ( virtual/libintl ) pcre? ( >=dev-libs/libpcre-7.8-r1 ) virtual/libiconv
+SLOT=0
+SRC_URI=mirror://gnu/grep/grep-2.14.tar.xz mirror://gentoo/grep-2.14.tar.xz
+_md5_=0163cd290605529b5748f9cc74fbc971
diff --git a/metadata/md5-cache/sys-apps/grep-2.5.4-r1 b/metadata/md5-cache/sys-apps/grep-2.5.4-r1
deleted file mode 100644
index 61c6690..0000000
--- a/metadata/md5-cache/sys-apps/grep-2.5.4-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install prepare
-DEPEND=nls? ( virtual/libintl ) pcre? ( >=dev-libs/libpcre-7.8-r1 ) nls? ( sys-devel/gettext )
-DESCRIPTION=GNU regular expression matcher
-EAPI=2
-HOMEPAGE=http://www.gnu.org/software/grep/
-IUSE=nls pcre
-KEYWORDS=alpha amd64 ~amd64-fbsd arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc ~sparc-fbsd x86 ~x86-fbsd
-LICENSE=GPL-3
-RDEPEND=nls? ( virtual/libintl ) pcre? ( >=dev-libs/libpcre-7.8-r1 )
-SLOT=0
-SRC_URI=mirror://gnu/grep/grep-2.5.4.tar.bz2 mirror://gentoo/grep-2.5.4.tar.bz2
-_eclasses_=eutils	33ef77a15337022e05342d2c772a7a5a	multilib	5f4ad6cf85e365e8f0c6050ddd21659e	portability	0be430f759a631e692678ed796e09f5c	toolchain-funcs	6526ac6fc9aedf391efb91fcd75ace68	user	9e552f935106ff0bc92af16da64b4b29
-_md5_=6b900694e2d8b114b32d72e456e436f9
diff --git a/sys-apps/grep/Manifest b/sys-apps/grep/Manifest
index 9aa4180..c3250f1 100644
--- a/sys-apps/grep/Manifest
+++ b/sys-apps/grep/Manifest
@@ -1 +1 @@
-DIST grep-2.5.4.tar.bz2 723181 RMD160 52abf25681bc6830f372ea7607480da69eaa06fd SHA1 9bbd4f02b18bb264e0fcb17293b6f0445c8694d2 SHA256 0abec64e01458fbd032e33351d8071602a959529ea796965e98338ee83a40020
+DIST grep-2.14.tar.xz 1195640 RMD160 4157376c36ebb7b5da83687f241745ca6df9058b SHA1 fb6ea404a0ef915334ca6212c7b517432ffe193e SHA256 e70e801d4fbb16e761654a58ae48bf5020621c95c8e35bd864742577685872e1
diff --git a/sys-apps/grep/grep-2.14.ebuild b/sys-apps/grep/grep-2.14.ebuild
new file mode 100644
index 0000000..0acc445
--- /dev/null
+++ b/sys-apps/grep/grep-2.14.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/grep/grep-2.14.ebuild,v 1.8 2012/12/24 01:32:46 vapier Exp $
+
+EAPI="3"
+
+DESCRIPTION="GNU regular expression matcher"
+HOMEPAGE="http://www.gnu.org/software/grep/"
+SRC_URI="mirror://gnu/${PN}/${P}.tar.xz
+	mirror://gentoo/${P}.tar.xz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="nls pcre"
+
+RDEPEND="nls? ( virtual/libintl )
+	pcre? ( >=dev-libs/libpcre-7.8-r1 )
+	virtual/libiconv"
+DEPEND="${RDEPEND}
+	nls? ( sys-devel/gettext )"
+
+src_configure() {
+	econf \
+		--bindir="${EPREFIX}"/bin \
+		$(use_enable nls) \
+		$(use_enable pcre perl-regexp)
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die
+	dodoc AUTHORS ChangeLog NEWS README THANKS TODO
+}
diff --git a/sys-apps/grep/grep-2.5.4-r1.ebuild b/sys-apps/grep/grep-2.5.4-r1.ebuild
deleted file mode 100644
index 400bd7d..0000000
--- a/sys-apps/grep/grep-2.5.4-r1.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/grep/grep-2.5.4-r1.ebuild,v 1.8 2009/07/04 12:20:42 nixnut Exp $
-
-EAPI=2
-
-inherit eutils
-
-DESCRIPTION="GNU regular expression matcher"
-HOMEPAGE="http://www.gnu.org/software/grep/"
-SRC_URI="mirror://gnu/${PN}/${P}.tar.bz2
-	mirror://gentoo/${P}.tar.bz2"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="alpha amd64 ~amd64-fbsd arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc ~sparc-fbsd x86 ~x86-fbsd"
-IUSE="nls pcre"
-
-RDEPEND="nls? ( virtual/libintl )
-	pcre? ( >=dev-libs/libpcre-7.8-r1 )"
-DEPEND="${RDEPEND}
-	nls? ( sys-devel/gettext )"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-2.5.3-po-builddir-fix.patch
-	epatch "${FILESDIR}"/${PN}-2.5.3-nls.patch
-}
-
-src_configure() {
-	econf \
-		--bindir=/bin \
-		$(use_enable nls) \
-		$(use_enable pcre perl-regexp) \
-		$(use elibc_FreeBSD || echo --without-included-regex) \
-		|| die "econf failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "make install failed"
-	dodoc AUTHORS ChangeLog NEWS README THANKS TODO
-}