diff --git a/commitpkg.in b/commitpkg.in
index 1f9492c..ad23c83 100644
--- a/commitpkg.in
+++ b/commitpkg.in
@@ -99,14 +99,14 @@ if [[ -z $server ]]; then
 fi
 
 if [[ -n $(svn status -q) ]]; then
-	msgtemplate="upgpkg: $pkgbase $(get_full_version)"$'\n\n'
+	msgtemplate="$(get_full_version)"
 	if [[ -n $1 ]]; then
 		stat_busy 'Committing changes to trunk'
-		svn commit -q -m "${msgtemplate}${1}" || die
+		svn commit -q -m "${msgtemplate}: ${1}" || die
 		stat_done
 	else
 		msgfile="$(mktemp)"
-		echo "$msgtemplate" > "$msgfile"
+		echo "$msgtemplate"$'\n\n' > "$msgfile"
 		if [[ -n $SVN_EDITOR ]]; then
 			$SVN_EDITOR "$msgfile"
 		elif [[ -n $VISUAL ]]; then