diff --git a/sunrise-commit b/sunrise-commit
index 1191ec7..6b33a7e 100755
--- a/sunrise-commit
+++ b/sunrise-commit
@@ -213,6 +213,8 @@ Options:
 	-C, --nocolor		disable colorful output,
 	-d, --noupdate		disable updating the repository,
 	-f, --force		force repoman to proceed with the commit,
+	-m, --noformat		do not prepend the commit message with package names,
+	-q, --quiet		backwards compat (ignored),
 	-t, --trivial		trivial changes (do not add a ChangeLog entry),
 	-v, --verbose		enable verbose output.
 _EOH_
@@ -240,7 +242,7 @@ confirm() {
 
 # Guess what!
 main() {
-	local commitmsg force monochrome noupdate trivial
+	local commitmsg force monochrome noprepend noupdate trivial
 	unset SC_VERBOSE
 
 	while [ ${#} -gt 0 ]; do
@@ -266,6 +268,11 @@ main() {
 			-f|--force)
 				force=1
 				;;
+			-m|--noformat)
+				noprepend=
+				;;
+			-q|--quiet)
+				;;
 			-t|--trivial)
 				trivial=1
 				;;
@@ -380,7 +387,7 @@ main() {
 			fi
 
 			sayv "Now, let's let repoman do its job..."
-			exec repoman commit ${old_repoman--a} ${force+-f} -m "${SC_CP}: ${commitmsg}"
+			exec repoman commit ${old_repoman--a} ${force+-f} -m "${noprepend-${SC_CP}: }${commitmsg}"
 			;;
 		package-removal)
 			vcs_status ${SC_CHANGE_LIST}
@@ -394,7 +401,7 @@ main() {
 				vcs_update ${SC_CHANGE_LIST}
 			fi
 
-			vcs_commit "${SC_CP}: ${commitmsg}" ${SC_CHANGE_LIST}
+			vcs_commit "${noprepend-${SC_CP}: }${commitmsg}" ${SC_CHANGE_LIST}
 			;;
 	esac
 }
diff --git a/sunrise-commit.1 b/sunrise-commit.1
index 487613d..5bcbc04 100644
--- a/sunrise-commit.1
+++ b/sunrise-commit.1
@@ -54,6 +54,14 @@ force proceeding with the commit even if QA violations occur. This
 means ignoring `\fIrepoman full\fP' results and passing \fB--force\fP to
 `\fIrepoman commit\fP'
 
+.IP "\fB-m\fP, \fB--noformat\fP"
+
+disable prepending the commit message with package names
+
+.IP "\fB-q\fP, \fB--quiet\fP"
+
+ignored (provided for backwards compatibility)
+
 .IP "\fB-t\fP, \fB--trivial\fP"
 
 assume the changes are trivial and thus do not require a ChangeLog