diff --git a/srcpkgs/kernel-snapshot/INSTALL b/srcpkgs/kernel-snapshot/INSTALL
index 7cee7f4aff1..ad21707fb05 100644
--- a/srcpkgs/kernel-snapshot/INSTALL
+++ b/srcpkgs/kernel-snapshot/INSTALL
@@ -1,7 +1,7 @@
 #
 # This script builds the required initramfs.
 #
-_KVER="2.6.38-rc6"
+_KVER="2.6.38-rc7"
 
 case "${ACTION}" in
 post)
diff --git a/srcpkgs/kernel-snapshot/REMOVE b/srcpkgs/kernel-snapshot/REMOVE
index 9bbc2183715..2322ea36ba0 100644
--- a/srcpkgs/kernel-snapshot/REMOVE
+++ b/srcpkgs/kernel-snapshot/REMOVE
@@ -1,7 +1,7 @@
 #
 # This script removes the initramfs.
 #
-_KVER="2.6.38-rc6"
+_KVER="2.6.38-rc7"
 
 case "${ACTION}" in
 post)
diff --git a/srcpkgs/kernel-snapshot/template b/srcpkgs/kernel-snapshot/template
index 29a7ac1897c..ad3e583e7e5 100644
--- a/srcpkgs/kernel-snapshot/template
+++ b/srcpkgs/kernel-snapshot/template
@@ -11,11 +11,11 @@ pkgname=kernel-snapshot
 _kernel_headers_revision=${revision}
 _kernel_snapshot=yes
 _kernel_ver=2.6.38
-_kernel_patch_ver=rc6
+_kernel_patch_ver=rc7
 version=${_kernel_ver}${_kernel_patch_ver}
 wrksrc="linux-${_kernel_ver}-${_kernel_patch_ver}"
 distfiles="${KERNEL_SITE}/kernel/v2.6/testing/linux-${_kernel_ver}-${_kernel_patch_ver}.tar.bz2"
-checksum=43cb558caaa930ff942d6206e43523dee5a51247c82c9cde7c09f4dce50bd8d0
+checksum=ac37633c0a2527eb6c8504f434c3bca15e7472bd1f2af1afac19d44393e633d4
 subpackages="$pkgname-headers"
 
 noverifyrdeps=yes
diff --git a/srcpkgs/m4/template b/srcpkgs/m4/template
index df749604950..42df2649957 100644
--- a/srcpkgs/m4/template
+++ b/srcpkgs/m4/template
@@ -1,12 +1,12 @@
 # Template build file for 'm4'.
 pkgname=m4
-version=1.4.14
+version=1.4.16
 distfiles="http://ftp.gnu.org/gnu/m4/$pkgname-$version.tar.bz2"
 build_style=gnu_configure
 configure_args="--enable-changeword --enable-threads"
 short_desc="GNU version of UNIX m4 macro language processor"
 maintainer="Juan RP <xtraeme@gmail.com>"
-checksum=0885ffa93256353a96b1cf0bcbc4d639ed09953b687e6cc412c4048e656f4dd2
+checksum=42500c1fddd90bcb161e6b58de931d769929c495c124112d67428a23543db90c
 long_desc="
  GNU m4 is an implementation of the traditional UNIX macro
  processor. It is mostly SVR4 compatible, although it has some
diff --git a/srcpkgs/mercurial/template b/srcpkgs/mercurial/template
index 90b7bd8a349..a06b9817c82 100644
--- a/srcpkgs/mercurial/template
+++ b/srcpkgs/mercurial/template
@@ -1,11 +1,11 @@
 # Template file for 'mercurial'
 pkgname=mercurial
-version=1.7.5
+version=1.8
 distfiles="http://mercurial.selenic.com/release/$pkgname-$version.tar.gz"
 build_style=python-module
 short_desc="Fast, lightweight source control management system"
 maintainer="Juan RP <xtraeme@gmail.com>"
-checksum=dfadcf883d30a923c7164ed0f3b8ee72e63030627668707f954dd12d8a4d0491
+checksum=421d19151f754d8452b5cf0817e0bbac2f74d93a4f76f9de41fc7a7f33c5db93
 long_desc="
  Mercurial is a fast, lightweight Source Control Management system
  designed for efficient handling of very large distributed projects.
diff --git a/srcpkgs/shadow/template b/srcpkgs/shadow/template
index fac966e338d..c0b983cbdf4 100644
--- a/srcpkgs/shadow/template
+++ b/srcpkgs/shadow/template
@@ -1,14 +1,13 @@
 # Template file for 'shadow'
 pkgname=shadow
-version=4.1.4.2
-revision=4
+version=4.1.4.3
 distfiles="ftp://pkg-shadow.alioth.debian.org/pub/pkg-shadow/$pkgname-$version.tar.bz2"
 build_style=gnu_configure
 configure_args="--libdir=/lib --enable-shared --disable-static
  --with-libpam --without-selinux"
 short_desc="Shadow password file utilities"
 maintainer="Juan RP <xtraeme@gmail.com>"
-checksum=97987f6a7967a85e6aa0dba2a1d52db8bd69af5a717391de5693db768fb78990
+checksum=633f5bb4ea0c88c55f3642c97f9d25cbef74f82e0b4cf8d54e7ad6f9f9caa778
 long_desc="
  Shadow password file utilities for GNU/Linux."
 
diff --git a/srcpkgs/sudo/template b/srcpkgs/sudo/template
index acda989af53..b0d43d40435 100644
--- a/srcpkgs/sudo/template
+++ b/srcpkgs/sudo/template
@@ -1,20 +1,21 @@
 # Template build file for 'sudo'.
 pkgname=sudo
-version=1.7.4p6
+version=1.8.0
 distfiles="http://www.courtesan.com/sudo/dist/$pkgname-$version.tar.gz"
 build_style=gnu_configure
 configure_args="--with-ignore-dot -with-all-insults --with-env-editor
---enable-shell-sets-home --enable-noargs-shell --disable-setresuid
---disable-root-sudo --with-logfac=auth --without-sendmail --disable-root-mailer"
+--enable-shell-sets-home --enable-noargs-shell --without-sendmail
+--disable-root-sudo --with-logfac=auth --disable-root-mailer"
 short_desc="Allow others to run commands as root"
 maintainer="Juan RP <xtraeme@gmail.com>"
-checksum=20091ef71018698c674c779f4b57178b2ecb4275fa34909b06219d2688ad14d5
+checksum=75e11dd37e04df08357037526523ad7f9c340e53ab94d9667a406945bb9c892c
 long_desc="
  Sudo is a program designed to allow a sysadmin to give limited root
  privileges to users and log root activity. The basic philosophy is to
  give as few privileges as possible but still allow people to get their
  work done."
 
+keep_empty_dirs=yes
 conf_files="/etc/pam.d/sudo /etc/sudoers"
 nostrip=yes
 
@@ -23,13 +24,6 @@ Add_dependency run zlib
 Add_dependency run pam
 Add_dependency build zlib-devel
 Add_dependency build pam-devel
-Add_dependency build diffutils
-
-pre_install()
-{
-	# Use cmp from diffutils.
-	export PATH="/usr/bin:$PATH"
-}
 
 post_install()
 {