diff --git a/ChangeLog b/ChangeLog
index 31dfd3ce..1da0023a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2009-01-06  Sebastian Rick Rijkers  <srrijkers@gmail.com>
+
+	* NEWS, src/su.c: Preserve COLORTERM in addition to TERM when su
+	is called with the -l option.
+
 2008-12-23  Nicolas François  <nicolas.francois@centraliens.net>
 
 	* libmisc/chkname.c: Use a bool when possible instead of integers.
diff --git a/NEWS b/NEWS
index 0ba256f8..b1ddc075 100644
--- a/NEWS
+++ b/NEWS
@@ -69,6 +69,8 @@ shadow-4.1.2.2 -> shadow-4.1.3						UNRELEASED
   * For compatibility with other passwd version, the --lock an --unlock
     options do not lock or unlock the user account anymore.  They only
     lock or unlock the user's password.
+- su
+  * 
 - useradd
   * audit logging improvements.
   * Speedup (see "addition of users or groups" above).
diff --git a/README b/README
index f40de1ae..e8ee43a3 100644
--- a/README
+++ b/README
@@ -1,14 +1,19 @@
 Shadow SITES
 ============
 
+Homepage
+	http://pkg-shadow.alioth.debian.org/
+
 FTP site
 	ftp://pkg-shadow.alioth.debian.org/pub/pkg-shadow
 
 SVN repository
-	anonymous read only access: svn://svn.debian.org/pkg-shadow/
+	anonymous read only access: svn://svn.debian.org/pkg-shadow/upstream
 
 SVN web interface
-	http://svn.debian.org/wsvn/pkg-shadow
+	http://svn.debian.org/wsvn/pkg-shadow/upstream
+	or
+	http://svn.debian.org/viewsvn/pkg-shadow/upstream
 
 Mailing lists
 	for general discuss: pkg-shadow-devel@lists.alioth.debian.org
@@ -84,6 +89,7 @@ Martin Bene <mb@sime.com>
 Martin Mares <mj@gts.cz>
 Michael Meskes <meskes@topsystem.de>
 Michael Talbot-Wilson <mike@calypso.bns.com.au>
+Mike Frysinger <vapier@gentoo.org>
 Mike Pakovic <mpakovic@users.southeast.net>
 Nicolas François <nicolas.francois@centraliens.net>
 Nikos Mavroyanopoulos <nmav@i-net.paiko.gr>
@@ -92,7 +98,8 @@ Phillip Street
 Rafał Maszkowski <rzm@icm.edu.pl>
 Rani Chouha <ranibey@smartec.com>
 Sami Kerola <kerolasa@rocketmail.com>
-Seraphim Mellos  <mellos@ceid.upatras.gr>
+Sebastian Rick Rijkers <srrijkers@gmail.com>
+Seraphim Mellos <mellos@ceid.upatras.gr>
 Shane Watts <shane@nexus.mlckew.edu.au>
 Steve M. Robbins <steve@nyongwa.montreal.qc.ca>
 Thorsten Kukuk <kukuk@suse.de>
@@ -104,5 +111,6 @@ Werner Fink <werner@suse.de>
 Maintainers
 ===========
 
-Tomasz Kłoczko <kloczek@pld.org.pl> (2000-2006)
+Tomasz Kłoczko <kloczek@pld.org.pl> (2000-2007)
+Nicolas François <nicolas.francois@centraliens.net> (2007-now)
 
diff --git a/TODO b/TODO
index 8c98f199..6bc0c5c5 100644
--- a/TODO
+++ b/TODO
@@ -1,3 +1,8 @@
+groupadd.8.xml
+ * Groupnames may only be up to 16 characters long.
+   => remove the note if no limits.
+   => should depend on the --with-group-name-max-length option
+
 libxcrypt support
  * http://wiki.linuxfromscratch.org/patches/browser/trunk/shadow/shadow-4.0.18.1-owl_blowfish-1.patch
 
@@ -95,6 +100,10 @@ ALL:
   - Add check to move passwd passwords to shadow if there is a shadow
     file.
 
+- su
+  - add a login.defs configuration parameter to add variables to keep in
+    the environment with "su -l" (TERM/TERMCOLOR/...
+
 - vipw:
   - Is MAX_MEMBERS_PER_GROUP used by vipw?
 
diff --git a/src/su.c b/src/su.c
index 0a4aac3e..a17b209b 100644
--- a/src/su.c
+++ b/src/su.c
@@ -561,6 +561,20 @@ int main (int argc, char **argv)
 		if (NULL != cp) {
 			addenv ("TERM", cp);
 		}
+
+		/*
+		 * For some terminals COLORTERM seems to be the only way
+		 * for checking for that specific terminal. For instance,
+		 * gnome-terminal sets its TERM as "xterm" but its
+		 * COLORTERM as "gnome-terminal". The COLORTERM variable
+		 * is also of use when running GNU screen since it sets
+		 * TERM to "screen" but doesn't touch COLORTERM.
+		 */
+		cp = getenv ("COLORTERM");
+		if (NULL != cp) {
+			addenv ("COLORTERM", cp);
+		}
+
 #ifndef USE_PAM
 		cp = getdef_str ("ENV_TZ");
 		if (NULL != cp) {