diff --git a/capplets/about-me/ChangeLog b/capplets/about-me/ChangeLog
index 7c5e449a8..bec0bc431 100644
--- a/capplets/about-me/ChangeLog
+++ b/capplets/about-me/ChangeLog
@@ -1,3 +1,11 @@
+2006-09-15  Matt Keenan <matt.keenan@sun.com>
+
+	Fixes #349079
+
+	* gnome-about-me-password.c (spawn_passwd): don't use stdin, stdout
+	and stderr as variable names. Fixes compilation issue on Sun Studio
+	compiler.
+
 2006-08-07  Sebastien Bacher  <seb128@debian.org>
 
 	* gnome-about-me.c: (about_me_load_photo), (about_me_update_photo):
diff --git a/capplets/about-me/gnome-about-me-password.c b/capplets/about-me/gnome-about-me-password.c
index 5c29bde5c..f438ad42b 100644
--- a/capplets/about-me/gnome-about-me-password.c
+++ b/capplets/about-me/gnome-about-me-password.c
@@ -183,7 +183,7 @@ spawn_passwd (PasswordDialog *pdialog, GError **error)
 {
 	gchar	*argv[2];
 	gchar	*envp[1];
-	gint	stdin, stdout, stderr;
+	gint	my_stdin, my_stdout, my_stderr;
 	
 	argv[0] = "/usr/bin/passwd";	/* Is it safe to rely on a hard-coded path? */
 	argv[1] = NULL;
@@ -204,9 +204,9 @@ spawn_passwd (PasswordDialog *pdialog, GError **error)
 								   NULL,						/* Child setup */
 								   NULL,						/* Data to child setup */
 								   &pdialog->backend_pid,		/* PID */
-								   &stdin,						/* Stdin */
-								   &stdout,						/* Stdout */
-								   &stderr,						/* Stderr */
+								   &my_stdin,						/* Stdin */
+								   &my_stdout,						/* Stdout */
+								   &my_stderr,						/* Stderr */
 								   error)) {					/* GError */
 		
 		/* An error occured */
@@ -216,7 +216,7 @@ spawn_passwd (PasswordDialog *pdialog, GError **error)
 	}
 	
 	/* 2>&1 */
-	if (dup2 (stderr, stdout) == -1) {
+	if (dup2 (my_stderr, my_stdout) == -1) {
 		/* Failed! */
 		g_set_error (error,
 					 PASSDLG_ERROR, 
@@ -230,8 +230,8 @@ spawn_passwd (PasswordDialog *pdialog, GError **error)
 	}
 	
 	/* Open IO Channels */
-	pdialog->backend_stdin = g_io_channel_unix_new (stdin);
-	pdialog->backend_stdout = g_io_channel_unix_new (stdout);
+	pdialog->backend_stdin = g_io_channel_unix_new (my_stdin);
+	pdialog->backend_stdout = g_io_channel_unix_new (my_stdout);
 	
 	/* Set raw encoding */
 	/* Set nonblocking mode */