diff --git a/sunrise-commit b/sunrise-commit
index 2d2d6fa..187aac2 100755
--- a/sunrise-commit
+++ b/sunrise-commit
@@ -441,7 +441,14 @@ main() {
 				fi
 			fi
 
-			vcs_status
+			if [ -z "${noupdate}" ]; then
+				sayv "Updating the repository..."
+				vcs_update
+			fi
+
+			if [ ${SC_VCS} != cvs -o -n "${noupdate}" ]; then
+				vcs_status
+			fi
 			echo
 
 			# Since commit 32264c3, repoman supports '--ask' option,
@@ -475,11 +482,6 @@ main() {
 				confirm
 			fi
 
-			if [ -z "${noupdate}" ]; then
-				sayv "Updating the repository..."
-				vcs_update
-			fi
-
 			# In CVS, we don't prepend the package name to the commit message.
 			[ ${SC_VCS} = cvs ] && noprepend=