diff --git a/templates/grep.tmpl b/templates/grep.tmpl
new file mode 100755
index 00000000000..0ad5709759f
--- /dev/null
+++ b/templates/grep.tmpl
@@ -0,0 +1,17 @@
+# Template build file for 'grep'.
+pkgname=grep
+version=2.5.3
+distfiles="http://ftp.gnu.org/gnu/grep/$pkgname-$version@.tar.bz2"
+build_style=gnu_configure
+short_desc="The GNU grep utility"
+maintainer="Juan RP <xtraeme@gmail.com>"
+checksum=d22dd8d626e557271aa555e7a06884a0114968845400ce1e7ab6f82b1f44b8fd
+long_desc="
+ GNU grep is based on a fast lazy-state deterministic matcher (about twice
+ as fast as stock Unix egrep) hybridized with a Boyer-Moore-Gosper search for
+ a fixed string that eliminates impossible text from being considered by the
+ full regexp matcher without necessarily having to look at every character.
+ The result is typically many times faster than Unix grep or egrep."
+
+build_depends="texinfo-4.13a pcre-7.8"
+run_depends="glibc-2.8 pcre-7.9"
diff --git a/templates/xbps-base-chroot.tmpl b/templates/xbps-base-chroot.tmpl
index 6b51adb20d8..5b33ac224ad 100644
--- a/templates/xbps-base-chroot.tmpl
+++ b/templates/xbps-base-chroot.tmpl
@@ -9,4 +9,5 @@ long_desc="
  inside of a chroot and continue installing them."
 
 build_depends="glibc-2.8 bash-3.2 coreutils-6.12 sed-4.1.5 make-3.81
- tar-1.20 bzip2-1.0.5 gzip-1.3.12 gawk-3.1.6 proplib-0.1 linux-headers-2.6.27.3"
+ tar-1.20 bzip2-1.0.5 gzip-1.3.12 gawk-3.1.6 grep-2.5.3 proplib-0.1
+ linux-headers-2.6.27.3"