diff --git a/Tools/scripts/rmport b/Tools/scripts/rmport
index 30d8e219441d..dd1251f54a78 100755
--- a/Tools/scripts/rmport
+++ b/Tools/scripts/rmport
@@ -410,7 +410,16 @@ fi
 gitlog=$(mktemp -t gitlog)
 gitrmlist=$(mktemp -t gitrmlist)
 
-echo "cleanup: Remove expired ports:" > ${gitlog}
+if [ $# -eq 1 ] ; then
+	topic="$1"
+	plural=""
+else
+	log "/!\\ Removing multiple ports at once, commit topic will generic /!\\"
+	topic="cleanup"
+	plural="s"
+fi
+
+echo "${topic}: Remove expired port${plural}:" > ${gitlog}
 echo "" >> ${gitlog}
 
 for catport in $* ; do