diff --git a/shutils/build_funcs.sh b/shutils/build_funcs.sh
index 0f0b19c4cb..66ff6c0166 100644
--- a/shutils/build_funcs.sh
+++ b/shutils/build_funcs.sh
@@ -55,9 +55,7 @@ build_src_phase()
 
 	[ -z "$make_cmd" ] && make_cmd=/usr/bin/make
 
-	#
-	# Run pre_build helpers.
-	#
+	# Run pre_build func.
 	run_func pre_build
 
 	[ -n "$XBPS_MAKEJOBS" -a -z "$disable_parallel_build" ] && \
@@ -79,12 +77,10 @@ build_src_phase()
 	${make_cmd} ${makejobs} ${make_build_args} ${make_build_target}
 	[ $? -ne 0 ] && msg_error "building $pkg (build phase)."
 
-	unset makejobs
+	# Run post_build func.
+	run_func post_build
 
-	#
-	# Run pre_install helpers.
-	#
-	run_func pre_install
+	unset makejobs
 
 	if [ -z "$in_chroot" ]; then
 		if [ -z "$libtool_fixup_la_stage" \
diff --git a/shutils/configure_funcs.sh b/shutils/configure_funcs.sh
index 7d0103fb3c..c7c3501fca 100644
--- a/shutils/configure_funcs.sh
+++ b/shutils/configure_funcs.sh
@@ -56,7 +56,7 @@ configure_src_phase()
 		cross_compile_setvars
 	fi
 
-	# Run pre_configure helpers.
+	# Run pre_configure func.
 	run_func pre_configure
 
 	# Export configure_env vars.
@@ -77,16 +77,10 @@ configure_src_phase()
 	# Packages using GNU autoconf
 	#
 	if [ "$build_style" = "gnu_configure" ]; then
-		if [ -z "$in_chroot" ]; then
-			infodir=${DESTDIR}/usr/share/info
-			mandir=${DESTDIR}/usr/share/man
-		else
-			infodir=/usr/share/info
-			mandir=/usr/share/man
-		fi
 		${configure_script}				\
 			--prefix=/usr --sysconfdir=/etc		\
-			--infodir=${infodir} --mandir=${mandir} \
+			--infodir=/usr/share/info		\
+			--mandir=/usr/share/man			\
 			${configure_args}
 	#
 	# Packages using propietary configure scripts.
@@ -120,6 +114,9 @@ configure_src_phase()
 		msg_error "building $pkg (configure phase)."
 	fi
 
+	# Run post_configure func.
+	run_func post_configure
+
 	# unset configure_env vars.
 	for f in ${configure_env}; do
 		unset eval ${f%=*}
diff --git a/shutils/install_funcs.sh b/shutils/install_funcs.sh
index 9cb1c6a18c..5020320ee9 100644
--- a/shutils/install_funcs.sh
+++ b/shutils/install_funcs.sh
@@ -48,6 +48,9 @@ install_src_phase()
 
 	cd $wrksrc || exit 1
 
+	# Run pre_install func.
+	run_func pre_install
+
 	msg_normal "Running install phase for $pkgname-$version."
 
 	# cross compilation vars.
@@ -62,9 +65,7 @@ install_src_phase()
 		make_install
 	fi
 
-	#
-	# Run post_install helpers.
-	#
+	# Run post_install func.
 	run_func post_install
 
 	# unset cross compiler vars.
@@ -115,8 +116,7 @@ install_src_phase()
 make_install()
 {
 	if [ -z "$make_install_target" ]; then
-		make_install_target="install prefix=${DESTDIR}/usr"
-		make_install_target="$make_install_target sysconfdir=${DESTDIR}/etc"
+		make_install_target="DESTDIR=${DESTDIR} install"
 	fi
 
 	[ -z "$make_cmd" ] && make_cmd=/usr/bin/make
diff --git a/shutils/tmpl_funcs.sh b/shutils/tmpl_funcs.sh
index be949db653..6ca95091d9 100644
--- a/shutils/tmpl_funcs.sh
+++ b/shutils/tmpl_funcs.sh
@@ -63,7 +63,8 @@ reset_tmpl_vars()
 			short_desc maintainer long_desc checksum wrksrc	\
 			patch_files make_cmd base_chroot register_shell \
 			make_build_target configure_script \
-			pre_configure pre_build pre_install post_install \
+			pre_configure pre_build pre_install \
+			post_configure post_build post_install \
 			make_install_target version \
 			xml_entries sgml_entries \
 			build_depends libtool_fixup_la_stage no_fixup_libtool \
diff --git a/templates/bash/template b/templates/bash/template
index 49ed5d25a8..642bd2bf2a 100644
--- a/templates/bash/template
+++ b/templates/bash/template
@@ -3,8 +3,7 @@ pkgname=bash
 version=4.0
 distfiles="http://ftp.gnu.org/gnu/bash/bash-$version.tar.gz"
 build_style=gnu_configure
-configure_args="--without-bash-malloc --with-curses
- --bindir=$XBPS_DESTDIR/$pkgname-$version/bin
+configure_args="--without-bash-malloc --with-curses --bindir=/bin
  --enable-array-variables --enable-brace-expansion --enable-casemod-attributes
  --enable-casemod-expansions --enable-command-timing --enable-cond-command
  --enable-cond-regexp --enable-coprocesses --enable-debugger
@@ -33,4 +32,5 @@ register_shell="/bin/bash"
 
 Add_dependency full	glibc
 Add_dependency build	ncurses
+Add_dependency build	texinfo
 Add_dependency run	ncurses-libs
diff --git a/templates/binutils/template b/templates/binutils/template
index 07bea96dde..c69d83a095 100644
--- a/templates/binutils/template
+++ b/templates/binutils/template
@@ -6,8 +6,7 @@ distfiles="http://ftp.gnu.org/gnu/binutils/$pkgname-$version.tar.bz2"
 build_style=gnu_configure
 configure_args="--disable-werror --enable-shared --enable-multilib
  --enable-64-bit-bfd"
-make_install_target="tooldir=$XBPS_DESTDIR/$pkgname-$version/usr
- install prefix=$XBPS_DESTDIR/$pkgname-$version/usr"
+make_install_args="tooldir=/usr"
 short_desc="GNU binary utilities"
 maintainer="Juan RP <xtraeme@gmail.com>"
 checksum=3e8225b4d7ace0a2039de752e11fd6922d3b89a7259a292c347391c4788739f6
diff --git a/templates/bison/template b/templates/bison/template
index 370d2c4449..805b4d8b4b 100644
--- a/templates/bison/template
+++ b/templates/bison/template
@@ -3,8 +3,6 @@ pkgname=bison
 version=2.4.1
 distfiles="http://ftp.gnu.org/pub/gnu/bison/$pkgname-$version.tar.bz2"
 build_style=gnu_configure
-configure_env="ac_cv_path_M4=/usr/bin/m4"
-make_install_target="DESTDIR=$XBPS_DESTDIR/$pkgname-$version install"
 short_desc="GNU yacc(1) replacement"
 maintainer="Juan RP <xtraeme@gmail.com>"
 checksum=2354469782149e36c644ae7c3e5105895424ed21cda5c05b591cb3dc17068e6b
diff --git a/templates/coreutils/template b/templates/coreutils/template
index ee0031fb59..17b27199d8 100644
--- a/templates/coreutils/template
+++ b/templates/coreutils/template
@@ -3,8 +3,8 @@ pkgname=coreutils
 version=7.1
 distfiles="http://ftp.gnu.org/gnu/coreutils/$pkgname-$version.tar.gz"
 build_style=gnu_configure
-configure_args="--bindir=$XBPS_DESTDIR/$pkgname-$version/bin
- --disable-acl --enable-install-program=hostname --without-gmp
+configure_args="--disable-acl --enable-install-program=hostname
+ --bindir=/bin --without-gmp
  ac_cv_header_selinux_flask_h=no ac_cv_header_selinux_selinux_h=no
  ac_cv_header_selinux_context_h=no ac_cv_search_setfilecon=no"
 configure_env="PERL=/usr/bin/perl"
diff --git a/templates/cracklib/template b/templates/cracklib/template
index 6e0eab6505..4e285f6cdf 100644
--- a/templates/cracklib/template
+++ b/templates/cracklib/template
@@ -4,7 +4,6 @@ version=2.8.13
 distfiles="${SOURCEFORGE_SITE}/cracklib/$pkgname-$version.tar.gz"
 build_style=gnu_configure
 configure_args="--without-python"
-make_install_target="DESTDIR=$XBPS_DESTDIR/$pkgname-$version install"
 short_desc="Password Checking Library"
 maintainer="Juan RP <xtraeme@gmail.com>"
 checksum=0a06caff3626c397d023f0c19efedfea295180c2c5ba2def57016a17e158041a
diff --git a/templates/dash/template b/templates/dash/template
index 6534613241..e689c10841 100644
--- a/templates/dash/template
+++ b/templates/dash/template
@@ -4,9 +4,8 @@ version=0.5.4
 distfiles="
 http://gondor.apana.org.au/~herbert/dash/files/$pkgname-$version.tar.gz"
 build_style=gnu_configure
-configure_args="--prefix= --mandir=/usr/share/man"
+configure_args="--prefix="
 configure_env="LANG=C"
-make_install_target="DESTDIR=$XBPS_DESTDIR/$pkgname-$version install"
 short_desc="POSIX-compliant Unix shell, much smaller than GNU bash"
 maintainer="Juan RP <xtraeme@gmail.com>"
 checksum=a9dc8f0237f632dd2c1bfeff80b1052e75fafaef0d767e3beab0bd8becced623
diff --git a/templates/dhcpcd/template b/templates/dhcpcd/template
index f3754f6434..7a5a373c71 100644
--- a/templates/dhcpcd/template
+++ b/templates/dhcpcd/template
@@ -3,7 +3,6 @@ pkgname=dhcpcd
 version=4.0.12
 distfiles="http://roy.marples.name/downloads/$pkgname/$pkgname-$version.tar.bz2"
 build_style=gnu_makefile
-make_install_args="DESTDIR=$XBPS_DESTDIR/$pkgname-$version install"
 short_desc="RFC2131 compliant DHCP client"
 maintainer="Juan RP <xtraeme@gmail.com>"
 checksum=0a1427ba109f9a1a1cfaf4e9ba36bcb92eea630fd4555835471129c2687ee1ff
diff --git a/templates/diffutils/template b/templates/diffutils/template
index 179bd94bc0..285c5ae38f 100644
--- a/templates/diffutils/template
+++ b/templates/diffutils/template
@@ -13,5 +13,4 @@ long_desc="
  These programs are usually used for creating patch files."
 
 base_chroot=yes
-
 Add_dependency run glibc
diff --git a/templates/eject/template b/templates/eject/template
index 976da6e337..13d1ea0194 100644
--- a/templates/eject/template
+++ b/templates/eject/template
@@ -4,7 +4,6 @@ version=2.1.5
 wrksrc=eject
 distfiles="http://ca.geocities.com/jefftranter@rogers.com/$pkgname-$version.tar.gz"
 build_style=gnu_configure
-make_install_target="DESTDIR=$XBPS_DESTDIR/$pkgname-$version install"
 short_desc="Ejects CDs and operates CD-Changers under Linux"
 maintainer="Juan RP <xtraeme@gmail.com>"
 checksum=ef9f7906484cfde4ba223b2682a37058f9a3c7d3bb1adda7a34a67402e2ffe55
diff --git a/templates/findutils/template b/templates/findutils/template
index e7044ac318..0c80d3cd7d 100644
--- a/templates/findutils/template
+++ b/templates/findutils/template
@@ -4,8 +4,6 @@ version=4.4.0
 distfiles="http://ftp.gnu.org/gnu/$pkgname/$pkgname-$version.tar.gz"
 build_style=gnu_configure
 configure_args="--localstatedir=/var/lib/locate"
-make_install_args="
- localstatedir=$XBPS_DESTDIR/$pkgname-$version/var/lib/locate"
 short_desc="The GNU Find Utilities"
 maintainer="Juan RP <xtraeme@gmail.com>"
 checksum=fb108c2959f17baf3559da9b3854495b9bb69fb13309fdd05576c66feb661ea9
@@ -16,7 +14,6 @@ long_desc="
  locating capabilities to other commands."
 
 base_chroot=yes
-
 Add_dependency run glibc
 
 post_install()
diff --git a/templates/flex/template b/templates/flex/template
index 0eb3ddddba..f6d403e8cc 100644
--- a/templates/flex/template
+++ b/templates/flex/template
@@ -4,7 +4,6 @@ version=2.5.35
 distfiles="$SOURCEFORGE_SITE/flex/$pkgname-$version.tar.bz2"
 build_style=gnu_configure
 configure_args="--disable-rpath"
-make_install_target="DESTDIR=$XBPS_DESTDIR/$pkgname-$version install"
 short_desc="The Fast Lexical Analyzer"
 maintainer="Juan RP <xtraeme@gmail.com>"
 checksum=0becbd4b2b36b99c67f8c22ab98f7f80c9860aec70f0350a0018f29a88704e7b
diff --git a/templates/gcc/template b/templates/gcc/template
index 55fd07fe68..c14bda933b 100644
--- a/templates/gcc/template
+++ b/templates/gcc/template
@@ -9,7 +9,6 @@ build_style=gnu_configure
 configure_args="--enable-clocale=gnu --disable-bootstrap
  --enable-threads=posix --enable-__cxa_atexit --disable-multilib
  --enable-languages=c,c++,objc,obj-c++ --enable-tls
- --with-local-prefix=$XBPS_DESTDIR/$pkgname-$version
  --with-mpfr=$XBPS_MASTERDIR/usr --with-gmp=$XBPS_MASTERDIR/usr
  --disable-rpath --with-system-zlib --enable-shared"
 short_desc="The GNU C Compiler suite"
diff --git a/templates/gdbm/template b/templates/gdbm/template
index 9398b7772c..820505c596 100644
--- a/templates/gdbm/template
+++ b/templates/gdbm/template
@@ -4,6 +4,7 @@ sourcepkg=gdbm
 version=1.8.3
 distfiles="http://ftp.gnu.org/gnu/$pkgname/$pkgname-$version.tar.gz"
 build_style=gnu_configure
+make_install_args="INSTALL_ROOT=$XBPS_DESTDIR/$pkgname-$version"
 short_desc="GNU database routines"
 maintainer="Juan RP <xtraeme@gmail.com>"
 checksum=cc340338a2e28b40058ab9eb5354a21d53f88a1582ea21ba0bb185c37a281dc9
@@ -12,5 +13,10 @@ long_desc="
  It works similar to the standard Unix dbm routines."
 
 subpackages="devel"
-
 Add_dependency full glibc
+
+post_build()
+{
+	mkdir -p ${DESTDIR}/usr/share/info
+	touch -f ${DESTDIR}/usr/share/info/dir
+}
diff --git a/templates/gettext/template b/templates/gettext/template
index 8564926b09..bf132b9fb4 100644
--- a/templates/gettext/template
+++ b/templates/gettext/template
@@ -2,10 +2,9 @@
 pkgname=gettext
 sourcepkg=gettext
 version=0.17
-distfiles="
-http://ftp.gnu.org/pub/gnu/gettext/gettext-$version.tar.gz"
+distfiles="http://ftp.gnu.org/pub/gnu/$pkgname/$pkgname-$version.tar.gz"
 build_style=gnu_configure
-configure_args="--disable-java --disable-native-java --disable-charp
+configure_args="--disable-java --disable-native-java --disable-csharp
  --disable-libasprintf"
 short_desc="Internationalized Message Handling Library and tools"
 maintainer="Juan RP <xtraeme@gmail.com>"
@@ -15,8 +14,10 @@ long_desc="
  messages in different languages, as one of the steps to
  internationalisation (or i18n) of a utility."
 
+base_chroot=yes
 subpackages="devel libs"
 
 Add_dependency full	glibc
-Add_dependency full	ncurses
+Add_dependency build	ncurses
+Add_dependency run	ncurses-libs
 Add_dependency run	gettext-libs
diff --git a/templates/git/template b/templates/git/template
index 3f9cb5c632..a8c5036f70 100644
--- a/templates/git/template
+++ b/templates/git/template
@@ -5,7 +5,6 @@ distfiles="
 http://www.kernel.org/pub/software/scm/git/$pkgname-$version.tar.bz2"
 build_style=gnu_configure
 configure_args="--with-shell=/bin/sh --with-curl --with-expat --without-tcltk"
-make_install_target="DESTDIR=$XBPS_DESTDIR/$pkgname-$version install"
 short_desc="GIT Tree History Storage Tool"
 maintainer="Juan RP <xtraeme@gmail.com>"
 checksum=ab7dc40240092aa2e72a8db7e0045893ca5fa07a936e9fa83b242248e3c9f635
diff --git a/templates/glib/template b/templates/glib/template
index e7f7320192..33b4a3c09b 100644
--- a/templates/glib/template
+++ b/templates/glib/template
@@ -4,10 +4,7 @@ sourcepkg=glib
 version=2.18.2
 distfiles="
 http://ftp.gnome.org/pub/gnome/sources/glib/2.18/$pkgname-$version.tar.bz2"
-# Disable FAM for now and use the installed pcre package instead
-# of the supplied one.
 configure_args="--disable-fam --with-pcre=system"
-ignore_files="charset.alias"
 build_style=gnu_configure
 short_desc="The GNU library of C routines"
 maintainer="Juan RP <xtraeme@gmail.com>"
diff --git a/templates/glibc/template b/templates/glibc/template
index f964fbef18..e8b91f98cf 100644
--- a/templates/glibc/template
+++ b/templates/glibc/template
@@ -11,8 +11,8 @@ build_style=gnu_configure
 configure_script="../configure"
 configure_args="--with-tls -disable-profile --with-__thread
  --enable-kernel=2.6.27 --enable-add-ons --without-gd
- --without-cvs --without-selinux --infodir=/usr/share/info
- --libdir=/usr/lib --libexecdir=/usr/lib --enable-stackguard-randomization
+ --without-cvs --without-selinux --libexecdir=/usr/lib
+ --libdir=/usr/lib --enable-stackguard-randomization
  --with-headers=$XBPS_MASTERDIR/usr/include"
 make_install_target="install_root=$XBPS_DESTDIR/$pkgname-$version install"
 short_desc="The GNU C library"
diff --git a/templates/grep/template b/templates/grep/template
index 849a27d998..79f30ddee3 100644
--- a/templates/grep/template
+++ b/templates/grep/template
@@ -3,8 +3,7 @@ pkgname=grep
 version=2.5.4
 distfiles="http://ftp.gnu.org/gnu/grep/$pkgname-$version.tar.bz2"
 build_style=gnu_configure
-configure_args="--bindir=$XBPS_DESTDIR/$pkgname-$version/bin
- --disable-perl-regexp"
+configure_args="--disable-perl-regexp"
 short_desc="The GNU grep utility"
 maintainer="Juan RP <xtraeme@gmail.com>"
 checksum=0abec64e01458fbd032e33351d8071602a959529ea796965e98338ee83a40020
diff --git a/templates/groff/template b/templates/groff/template
index c6a9edc020..8feeee7c86 100644
--- a/templates/groff/template
+++ b/templates/groff/template
@@ -21,9 +21,3 @@ Add_dependency full gcc-libstdc++
 Add_dependency full bash
 Add_dependency full zlib
 Add_dependency full sed
-
-pre_install()
-{
-	# The install target fails if the dir is not there already.
-	mkdir -p $XBPS_DESTDIR/$pkgname-$version/usr
-}
diff --git a/templates/gzip/template b/templates/gzip/template
index b801db4108..9320df6762 100644
--- a/templates/gzip/template
+++ b/templates/gzip/template
@@ -13,5 +13,10 @@ long_desc="
  standard compression program for its system."
 
 base_chroot=yes
-
 Add_dependency run glibc
+
+post_build()
+{
+	mkdir -p ${DESTDIR}/usr/share/info
+	touch -f ${DESTDIR}/usr/share/info/dir
+}
diff --git a/templates/iana-etc/template b/templates/iana-etc/template
index c47f1e5b0e..0ed7df5859 100644
--- a/templates/iana-etc/template
+++ b/templates/iana-etc/template
@@ -4,7 +4,6 @@ version=2.30
 distfiles="http://sethwklein.net/$pkgname-$version.tar.bz2"
 build_style=gnu_makefile
 make_build_args="STRIP=yes"
-make_install_args="DESTDIR=$XBPS_DESTDIR/$pkgname-$version"
 short_desc="Unix /etc/services and /etc/protocols files"
 maintainer="Juan RP <xtraeme@gmail.com>"
 checksum=b9a6874fb20012836efef75452ef2acae624022d680feeb1994d73facba3f20d
diff --git a/templates/iputils/template b/templates/iputils/template
index 8e40e85de0..b21ffc73d9 100644
--- a/templates/iputils/template
+++ b/templates/iputils/template
@@ -5,7 +5,6 @@ distver=s${version}
 wrksrc="$pkgname-$distver"
 distfiles="http://www.skbuff.net/$pkgname/$pkgname-$distver.tar.bz2"
 build_style=gnu_makefile
-make_install_args="DESTDIR=$XBPS_DESTDIR/$pkgname-$version"
 short_desc="IP Configuration Utilities (and Ping)"
 maintainer="Juan RP <xtraeme@gmail.com>"
 checksum=dbbd87554d66e438245487ac31aa4a542a1c6c1ec8273cfacbbfeda09eb44a93
diff --git a/templates/kbd/template b/templates/kbd/template
index 694629159e..b2a0c286e0 100644
--- a/templates/kbd/template
+++ b/templates/kbd/template
@@ -3,9 +3,8 @@ pkgname=kbd
 version=1.15
 distfiles="http://www.kernel.org/pub/linux/utils/kbd/kbd-$version.tar.bz2"
 build_style=configure
-configure_args="--datadir=/lib/kbd --bindir=/sbin --localedir=/usr/share/locale
- --mandir=/usr/share/man"
-make_install_args="DESTDIR=$XBPS_DESTDIR/$pkgname-$version"
+configure_args="--datadir=/lib/kbd --bindir=/sbin
+ --localedir=/usr/share/locale --mandir=/usr/share/man"
 short_desc="Linux keyboard utilities"
 maintainer="Juan RP <xtraeme@gmail.com>"
 checksum=8228501aadd7e3810a004063b5c1ab4b3d1a0dadd849851379f1e26df41f98f9
diff --git a/templates/libX11/template b/templates/libX11/template
index 400f95d130..ab5aa1cb6d 100644
--- a/templates/libX11/template
+++ b/templates/libX11/template
@@ -2,8 +2,7 @@ pkgname=libX11
 version=1.1.5
 distfiles="${XORG_SITE}/lib/$pkgname-$version.tar.bz2"
 build_style=gnu_configure
-configure_args="--mandir=/usr/share/man --without-xcb"
-make_install_target="install DESTDIR=$XBPS_DESTDIR/$pkgname-$version"
+configure_args="--without-xcb"
 short_desc="Base X libraries from modular Xorg X11"
 maintainer="Juan RP <xtraeme@gmail.com>"
 checksum=da9272900e41615e9c5dc25d84730b8966da6f5c8f4c40418dca2ad040fc8b82
diff --git a/templates/libevent/template b/templates/libevent/template
index 330d5366c1..44508b78f1 100644
--- a/templates/libevent/template
+++ b/templates/libevent/template
@@ -5,7 +5,6 @@ version=1.4.9
 wrksrc="$pkgname-$version-stable"
 distfiles="http://www.monkey.org/~provos/$pkgname-$version-stable.tar.gz"
 build_style=gnu_configure
-make_install_target="DESTDIR=$XBPS_DESTDIR/$pkgname-$version install"
 short_desc="Abstract asynchronous event notification library"
 maintainer="Juan RP <xtraeme@gmail.com>"
 checksum=f5c72e07db5554e9c888dda6a5f7feb86f266e98ffa3f7cdb1e66b030d1d2cbf
diff --git a/templates/m4/template b/templates/m4/template
index 5437923a54..1f10179610 100644
--- a/templates/m4/template
+++ b/templates/m4/template
@@ -4,7 +4,6 @@ version=1.4.12
 distfiles="http://ftp.gnu.org/gnu/m4/$pkgname-$version.tar.bz2"
 build_style=gnu_configure
 configure_args="--enable-changeword --enable-threads"
-make_install_target="DESTDIR=$XBPS_DESTDIR/$pkgname-$version install"
 short_desc="GNU version of UNIX m4 macro language processor"
 maintainer="Juan RP <xtraeme@gmail.com>"
 checksum=855217de304616931844f54bd00a1e03e92452f85de6caeec47b0e8244881ba3
diff --git a/templates/make/template b/templates/make/template
index 40ebee43c5..d326c9e54f 100644
--- a/templates/make/template
+++ b/templates/make/template
@@ -12,5 +12,4 @@ long_desc="
  recompile them, when necessary."
 
 base_chroot=yes
-
 Add_dependency run glibc
diff --git a/templates/ncurses/template b/templates/ncurses/template
index 00893f20ca..ed6e196f19 100644
--- a/templates/ncurses/template
+++ b/templates/ncurses/template
@@ -5,7 +5,6 @@ version=5.7
 distfiles="http://ftp.gnu.org/pub/gnu/ncurses/$pkgname-$version.tar.gz"
 build_style=gnu_configure
 configure_args="--with-shared --without-debug"
-make_install_args="ticdir=$XBPS_DESTDIR/$pkgname-$version/usr/share/terminfo"
 short_desc="A System V Release 4.0 curses emulation library"
 maintainer="Juan RP <xtraeme@gmail.com>"
 checksum=0a9bdea5c7de8ded5c9327ed642915f2cc380753f12d4ad120ef7da3ea3498f4
diff --git a/templates/nfs-utils/template b/templates/nfs-utils/template
index ccdd8f702b..f0b2b358c7 100644
--- a/templates/nfs-utils/template
+++ b/templates/nfs-utils/template
@@ -5,7 +5,6 @@ distfiles="http://downloads.sf.net/nfs/$pkgname-$version.tar.bz2"
 build_style=gnu_configure
 configure_args="--with-statduser=nobody --disable-gss --disable-nfsv4
  --enable-nfsv3 --with-statedir=/var/lib/nfs --enable-mount"
-make_install_target="DESTDIR=$XBPS_DESTDIR/$pkgname-$version install"
 short_desc="Network File System utilities"
 maintainer="Juan RP <xtraeme@gmail.com>"
 checksum=9a5da7cd85dc9087222ab348ce82577c38547177d5d4dc7fccc9e939c97d47dc
diff --git a/templates/ntp/template b/templates/ntp/template
index 144384b3ee..94505e9ce1 100644
--- a/templates/ntp/template
+++ b/templates/ntp/template
@@ -7,7 +7,6 @@ build_style=gnu_configure
 configure_args="--enable-linuxcaps --enable-getifaddrs=glibc
  --enable-all-clocks --enable-parse-clocks --with-crypto=openssl
  --enable-accurate-adjtime --without-rpath --enable-ipv6"
-make_install_target="DESTDIR=$XBPS_DESTDIR/$pkgname-$version install"
 short_desc="The Network Time Protocol"
 maintainer="Juan RP <xtraeme@gmail.com>"
 checksum=647640067c7c6a4c568af54c139ce07bbf9f69b54bf9be2704b4c99c56651067
diff --git a/templates/openssh/template b/templates/openssh/template
index a857431318..461e137218 100644
--- a/templates/openssh/template
+++ b/templates/openssh/template
@@ -11,7 +11,6 @@ configure_args="--libexecdir=/usr/libexec/openssh --with-tcp-wrappers
  --with-pam --with-mantype=man --with-xauth=/usr/bin/xauth
  --without-rpath --with-ssl-engine
  --without-selinux --with-privsep-path=/var/chroot/ssh"
-make_install_target="DESTDIR=$XBPS_DESTDIR/$pkgname-$version install"
 short_desc="The OpenSSH implementation of SSH protocol versions 1 and 2"
 maintainer="Juan RP <xtraeme@gmail.com>"
 checksum=4023710c37d0b3d79e6299cb79b6de2a31db7d581fe59e775a5351784034ecae
diff --git a/templates/pam/template b/templates/pam/template
index f87b5aad9e..9164b3e20d 100644
--- a/templates/pam/template
+++ b/templates/pam/template
@@ -6,12 +6,10 @@ wrksrc="Linux-PAM-$version"
 distfiles="
 http://www.kernel.org/pub/linux/libs/pam/library/Linux-PAM-$version.tar.bz2"
 build_style=gnu_configure
-configure_args="--disable-selinux --libdir=/lib
+configure_args="--disable-selinux --libdir=/lib --disable-rpath
  --docdir=/usr/share/doc/pam --enable-securedir=/lib/security
- --enable-sconfigdir=/etc/security --localedir=/usr/share/locale
- --datadir=/usr/share --disable-rpath --enable-read-both-confs"
-make_install_args="DESTDIR=$XBPS_DESTDIR/$pkgname-$version
- sysconfdir=/etc/security"
+ --enable-sconfigdir=/etc/security --enable-read-both-confs"
+make_install_args="sysconfdir=/etc/security"
 short_desc="A flexible mechanism for authenticating users"
 maintainer="Juan RP <xtraeme@gmail.com>"
 checksum=13136d438f5748d08dcb2227e44e53a3c611351b96e11891052e0c8c2557f3ca
diff --git a/templates/patch/template b/templates/patch/template
index 5441e00fc5..146c5cf86d 100644
--- a/templates/patch/template
+++ b/templates/patch/template
@@ -3,6 +3,8 @@ pkgname=patch
 version=2.5.9
 distfiles="ftp://alpha.gnu.org/gnu/diffutils/patch-$version.tar.gz"
 build_style=gnu_configure
+make_install_args="prefix=$XBPS_DESTDIR/$pkgname-$version/usr
+ mandir=$XBPS_DESTDIR/$pkgname-$version/usr/share/man"
 short_desc="Patch files using diff output"
 maintainer="Juan RP <xtraeme@gmail.com>"
 checksum=ecb5c6469d732bcf01d6ec1afe9e64f1668caba5bfdb103c28d7f537ba3cdb8a
diff --git a/templates/perl/template b/templates/perl/template
index 98da80ad04..443fa9a657 100644
--- a/templates/perl/template
+++ b/templates/perl/template
@@ -8,6 +8,7 @@ configure_args="-Dusethreads -des -Dprefix=$XBPS_DESTDIR/$pkgname-$version/usr
  -Dman1dir=$XBPS_DESTDIR/$pkgname-$version/usr/share/man/man1
  -Dman3dir=$XBPS_DESTDIR/$pkgname-$version/usr/share/man/man3"
 build_style=configure
+make_install_target="install"
 short_desc="Practical Extraction and Report Language"
 maintainer="Juan RP <xtraeme@gmail.com>"
 checksum=94464a0d374fa63226eee56e0bb3d35564f9d8391a1a8d9f0055805ec25f3b2e
diff --git a/templates/procps/template b/templates/procps/template
index f0dd89ef3f..bb3ca1f847 100644
--- a/templates/procps/template
+++ b/templates/procps/template
@@ -3,7 +3,6 @@ pkgname=procps
 version=3.2.7
 distfiles="http://procps.sf.net/$pkgname-$version.tar.gz"
 build_style=gnu_makefile
-make_install_args="DESTDIR=$XBPS_DESTDIR/$pkgname-$version"
 short_desc="The /proc file system utilities"
 maintainer="Juan RP <xtraeme@gmail.com>"
 checksum=b439e04adab9b1e66e11f59c4331680da48f1722f2123123f7c16dfbed2c38dc
diff --git a/templates/sed/template b/templates/sed/template
index 3c9d30981e..7dea0075e3 100644
--- a/templates/sed/template
+++ b/templates/sed/template
@@ -3,7 +3,7 @@ pkgname=sed
 version=4.1.5
 distfiles="http://ftp.gnu.org/gnu/$pkgname/$pkgname-$version.tar.gz"
 build_style=gnu_configure
-configure_args="--bindir=$XBPS_DESTDIR/$pkgname-$version/bin"
+configure_args="--bindir=/bin"
 short_desc="The GNU stream editor"
 maintainer="Juan RP <xtraeme@gmail.com>"
 checksum=be955bef7a81d69222e929689e0de0ecf64c13dc5b15b2ee5696d5ef66fdeec0
@@ -12,5 +12,4 @@ long_desc="
  to the standard output, edited according to a script of commands."
 
 base_chroot=yes
-
 Add_dependency run glibc
diff --git a/templates/shadow/template b/templates/shadow/template
index cc4107de80..146db82ca0 100644
--- a/templates/shadow/template
+++ b/templates/shadow/template
@@ -6,7 +6,6 @@ distfiles="ftp://pkg-shadow.alioth.debian.org/pub/pkg-shadow/$pkgname-$version.t
 build_style=gnu_configure
 configure_args="--libdir=/lib --enable-shared --disable-static
  --with-libpam --without-selinux"
-make_install_target="DESTDIR=$XBPS_DESTDIR/$pkgname-$version install"
 short_desc="Shadow password file utilities"
 maintainer="Juan RP <xtraeme@gmail.com>"
 checksum=378fbfb0e8bb8c87be239fccd692818871f763206bb7d881744f4fa72dc6b491
diff --git a/templates/tcp_wrappers/template b/templates/tcp_wrappers/template
index b161cd9be8..37fcea5f70 100644
--- a/templates/tcp_wrappers/template
+++ b/templates/tcp_wrappers/template
@@ -8,7 +8,6 @@ patch_args="-Np1"
 distfiles="ftp://ftp.porcupine.org/pub/security/${pkgname}_${version}.tar.gz"
 build_style=gnu_makefile
 make_build_target="REAL_DAEMON_DIR=/usr/sbin STYLE=-DSYS_ERRLIST_DEFINED linux"
-make_install_target="DESTDIR=$XBPS_DESTDIR/$pkgname-$version install"
 short_desc="A security tool which acts as a wrapper for TCP daemons"
 maintainer="Juan RP <xtraeme@gmail.com>"
 checksum=9543d7adedf78a6de0b221ccbbd1952e08b5138717f4ade814039bb489a4315d
diff --git a/templates/tzdata/template b/templates/tzdata/template
index 173aecbfd1..7574716766 100644
--- a/templates/tzdata/template
+++ b/templates/tzdata/template
@@ -6,7 +6,6 @@ distfiles="
 ftp://elsie.nci.nih.gov/pub/${pkgname}${version}.tar.gz
 ftp://elsie.nci.nih.gov/pub/tzcode${version}.tar.gz"
 build_style=gnu_makefile
-make_install_args="DESTDIR=$XBPS_DESTDIR/$pkgname-$version"
 short_desc="Time zone and daylight-saving time data"
 maintainer="Juan RP <xtraeme@gmail.com>"
 checksum="
diff --git a/templates/udev/template b/templates/udev/template
index 2419b7edd4..385f91d712 100644
--- a/templates/udev/template
+++ b/templates/udev/template
@@ -5,7 +5,6 @@ distfiles="
 http://www.kernel.org/pub/linux/utils/kernel/hotplug/udev-${version}.tar.bz2"
 build_style=gnu_configure
 configure_args="--exec-prefix= --without-selinux"
-make_install_target="DESTDIR=$XBPS_DESTDIR/$pkgname-$version install"
 short_desc="A userspace implementation of devfs"
 maintainer="Juan RP <xtraeme@gmail.com>"
 checksum=6786a896146b12323d0ef31601dc23b6e5501762d7d61c475d09e405494c21df
diff --git a/templates/util-linux-ng/template b/templates/util-linux-ng/template
index d0d01c2a19..3694090969 100644
--- a/templates/util-linux-ng/template
+++ b/templates/util-linux-ng/template
@@ -4,7 +4,6 @@ version=2.14.2
 distfiles="http://www.kernel.org/pub/linux/utils/$pkgname/v2.14/$pkgname-$version.tar.bz2"
 build_style=gnu_configure
 configure_args="--enable-partx --enable-write"
-make_install_target="DESTDIR=$XBPS_DESTDIR/$pkgname-$version install"
 short_desc="Miscellaneous linux utilities"
 maintainer="Juan RP <xtraeme@gmail.com>"
 checksum=108e63e9a007f6a8c0eff841dd38e0fe3b635c98b35bfac2d89b4b1a1ce0630e
@@ -14,17 +13,18 @@ long_desc="
  and messages."
 
 Add_dependency build	e2fsprogs
-Add_dependency run	glibc
+Add_dependency full	glibc
 Add_dependency run	e2fsprogs-libs
-Add_dependency run	coreutils
+Add_dependency full	coreutils
 Add_dependency run	ncurses-libs
-Add_dependency run	zlib
+Add_dependency full	zlib
 
 post_configure()
 {
 	cd $wrksrc
-	sed -e 's@etc/adjtime@var/lib/hwclock/adjtime@g'
-		-i $(grep -rl '/etc/adjtime' .)
+	for f in $(grep -rl '/etc/adjtime' .); do
+		sed -i -e 's@etc/adjtime@var/lib/hwclock/adjtime@g' $f
+	done
 }
 
 post_install()
diff --git a/templates/valgrind/template b/templates/valgrind/template
index d5b657b30b..cfd9553c3a 100644
--- a/templates/valgrind/template
+++ b/templates/valgrind/template
@@ -4,7 +4,6 @@ sourcepkg=$pkgname
 version=3.4.1
 distfiles="http://www.valgrind.org/downloads/$pkgname-$version.tar.bz2"
 build_style=gnu_configure
-make_install_target="DESTDIR=$XBPS_DESTDIR/$pkgname-$version install"
 short_desc="Tool for finding memory management bugs in programs"
 maintainer="Juan RP <xtraeme@gmail.com>"
 checksum=669ee7aab8a3a905520159b6d7be35d3911e1a4d7a67d90dc1c12c00693184a9
diff --git a/templates/wget/template b/templates/wget/template
index 23f51fcdb8..3cd9388c1a 100644
--- a/templates/wget/template
+++ b/templates/wget/template
@@ -31,5 +31,10 @@ long_desc="
 
 base_chroot=yes
 conf_files="/etc/wgetrc"
-
 Add_dependency run glibc
+
+post_build()
+{
+	mkdir -p ${DESTDIR}/usr/share/info
+	touch -f ${DESTDIR}/usr/share/info/dir
+}
diff --git a/templates/zlib/template b/templates/zlib/template
index 7984d2af2c..14560a6b5d 100644
--- a/templates/zlib/template
+++ b/templates/zlib/template
@@ -6,7 +6,8 @@ distfiles="http://www.zlib.net/$pkgname-$version.tar.bz2"
 build_style=configure
 CFLAGS="-fPIC -DPIC"
 configure_args="-s"
-short_desc="A Massively Spiffy Yet Delicately Unobtrusive Compression Library"
+make_install_args="prefix=$XBPS_DESTDIR/$pkgname-$version/usr"
+short_desc="A compression/decompression Library"
 maintainer="Juan RP <xtraeme@gmail.com>"
 checksum=e3b9950851a19904d642c4dec518623382cf4d2ac24f70a76510c944330d28ca
 long_desc="