diff --git a/sunrise-commit b/sunrise-commit
index 7a0c1e5..f3eb97f 100755
--- a/sunrise-commit
+++ b/sunrise-commit
@@ -480,6 +480,9 @@ main() {
 				vcs_update
 			fi
 
+			# In CVS, we don't prepend the package name to the commit message.
+			[ ${SC_VCS} = cvs ] && noprepend=
+
 			sayv "Now, let's let repoman do its job..."
 			exec repoman commit ${old_repoman--a} ${force+-f} -m "${noprepend-${SC_CP}: }${commitmsg}"
 			;;