diff --git a/nightly/bin/nightly b/nightly/bin/nightly
index 682f00857..f66887e93 100755
--- a/nightly/bin/nightly
+++ b/nightly/bin/nightly
@@ -51,11 +51,13 @@ usage () {
 
 scst_svn_repo="https://scst.svn.sourceforge.net/svnroot/scst/trunk"
 sendmail_opts=""
+run_if_unchanged="false"
 
-set -- $(/usr/bin/getopt "hr:" "$@")
+set -- $(/usr/bin/getopt "ahr:" "$@")
 while [ "$1" != "${1#-}" ]
 do
   case "$1" in
+    '-a') run_if_unchanged=true; shift;;
     '-h') usage; exit 1;;
     '-r') sendmail_opts="$1 $2"; shift; shift;;
     '--') shift;;
@@ -109,7 +111,7 @@ fi
 
 svn_old_rev="`get_svn_revision ${svn_old_date}`"
 svn_new_rev="`get_svn_revision ${svn_new_date}`"
-if [ "${svn_old_rev}" = "${svn_new_rev}" ]; then
+if [ "${run_if_unchanged}" != "true" -a "${svn_old_rev}" = "${svn_new_rev}" ]; then
   echo "Both {$svn_old_date} and {$svn_new_date} correspond to r${svn_new_rev}"\
        "-- skipping nightly build." >unchanged.log
   exit 0
diff --git a/nightly/conf/cellbuzz.conf b/nightly/conf/cellbuzz.conf
deleted file mode 100644
index f48cf0fc5..000000000
--- a/nightly/conf/cellbuzz.conf
+++ /dev/null
@@ -1,6 +0,0 @@
-
-# Specifics for the Cellbuzz system.
-
-ABT_DETAILS="x86_64, Fedora 10"
-ABT_JOBS=3
-ABT_KERNELS="2.6.38.6 2.6.37.6 2.6.36.4 2.6.35.13 2.6.35.13-u-nc 2.6.34.9-nc 2.6.33.13-nc 2.6.32.40-nc 2.6.31.14-nc 2.6.30.10-nc 2.6.29.6-nc 2.6.28.10-nc 2.6.27.59-nc 2.6.26.8-nc 2.6.25.20-nc 2.6.24.7-nc 2.6.23.17-nc"
diff --git a/nightly/conf/nightly.conf b/nightly/conf/nightly.conf
new file mode 100644
index 000000000..fb810eff8
--- /dev/null
+++ b/nightly/conf/nightly.conf
@@ -0,0 +1,24 @@
+# Nightly build configuration.
+
+ABT_DETAILS="x86_64"
+ABT_JOBS=5
+ABT_KERNELS="  \
+3.4.2          \
+3.3.8          \
+3.2.20         \
+3.1.10         \
+3.0.34-nc      \
+2.6.39.4-nc    \
+2.6.38.8-nc    \
+2.6.37.6-nc    \
+2.6.36.4-nc    \
+2.6.35.14      \
+2.6.35.14-u-nc \
+2.6.34.12-nc   \
+2.6.33.20-nc   \
+2.6.32.59-nc   \
+2.6.31.14-nc   \
+2.6.30.10-nc   \
+2.6.29.6-nc    \
+2.6.27.62-nc   \
+"
diff --git a/nightly/conf/cellbuzz.sendmail b/nightly/conf/nightly.sendmail
similarity index 94%
rename from nightly/conf/cellbuzz.sendmail
rename to nightly/conf/nightly.sendmail
index aef42958d..d28790ff3 100755
--- a/nightly/conf/cellbuzz.sendmail
+++ b/nightly/conf/nightly.sendmail
@@ -7,6 +7,7 @@ usage() {
 }
 
 recipients="scst-devel@lists.sourceforge.net"
+recipients="bvanassche@acm.org"
 
 while [ "$1" != "${1#-}" ]
 do
diff --git a/nightly/conf/pcbart.conf b/nightly/conf/pcbart.conf
deleted file mode 100644
index ad3b5663b..000000000
--- a/nightly/conf/pcbart.conf
+++ /dev/null
@@ -1,8 +0,0 @@
-
-# Specifics for Bart Van Assche's PC.
-
-ABT_DETAILS="x86_64, openSUSE 11.1"
-ABT_JOBS=3
-ABT_TMPDIR="$HOME/tmp-scst-${USER}-$$"
-#ABT_KERNELS="2.6.29.4 2.6.28.10 2.6.27.24 2.6.26.8 2.6.25.20 2.6.24.7 2.6.23.17"
-ABT_KERNELS="2.6.29.4 2.6.27.24 2.6.25.20 2.6.23.17"
diff --git a/nightly/conf/pcbart.sendmail b/nightly/conf/pcbart.sendmail
deleted file mode 100755
index d7108c223..000000000
--- a/nightly/conf/pcbart.sendmail
+++ /dev/null
@@ -1,14 +0,0 @@
-#!/bin/sh
-
-# usage: $0 subject file-to-mail [file-to-attach]
-# Don't forget to set the variables 'from' and 'realname' in ~/.muttrc !!
-
-recipients="scst-devel@lists.sourceforge.net"
-#recipients="bart.vanassche@gmail.com,bart"
-if [ $# -ge 3 ]; then
-  gzip -9 <"$3" >"$3.gz"
-  mutt -s "$1" -a "$3.gz" ${recipients} < "$2"
-  rm -f "$3.gz"
-else
-  mutt -s "$1" ${recipients} < "$2"
-fi
diff --git a/scripts/rebuild-rhel-kernel-rpm b/scripts/rebuild-rhel-kernel-rpm
index 091212173..e9f8c3a36 100755
--- a/scripts/rebuild-rhel-kernel-rpm
+++ b/scripts/rebuild-rhel-kernel-rpm
@@ -259,7 +259,7 @@ diff -u SPECS/kernel.spec{.orig,}
    make ARCH=$Arch %{oldconfig_target} > /dev/null
    echo "# $Arch" > configs/$i
 EOF
-elif [ ${kver#2.6.32-131} != $kver ]; then
+elif [ ${kver#2.6.32-131} != $kver -o ${kver#2.6.32-220} != $kver ]; then
 # RHEL/CentOS/SL 6.1
 patch -p1 ${rpmbuild_dir}/SPECS/kernel.spec <<'EOF' || exit $?
 # RHEL/CentOS/SL 6.x