diff --git a/ChangeLog b/ChangeLog
index cf02f0b8..7a46c87b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -6,6 +6,8 @@
 	not change environ) the authentication. And the authentication
 	does not overwrite those definitions. This will ease an extraction
 	from the big main() function.
+	* src/su.c: No need to change the user's shell in case of
+	subsystem root. Update the comments.
 
 2011-06-10  Nicolas François  <nicolas.francois@centraliens.net>
 
diff --git a/src/su.c b/src/su.c
index 0abea16a..118cdd05 100644
--- a/src/su.c
+++ b/src/su.c
@@ -908,11 +908,10 @@ int main (int argc, char **argv)
 	 * --shell, which will be the one executed in the chroot later).
 	 */
 	if ('*' == pwent.pw_shell[0]) {	/* subsystem root required */
-		pwent.pw_shell++;	/* skip the '*' */
-		subsystem (&pwent);	/* figure out what to execute */
-		endpwent ();
+		subsystem (&pwent);	/* change to the subsystem root */
+		endpwent ();		/* close the old password databases */
 		endspent ();
-		goto top;
+		goto top;		/* authenticate in the subsystem */
 	}
 
 	sulog (tty, true, oldname, name);	/* save SU information */