diff --git a/hack/changelog.sh b/hack/changelog.sh
index a8019c187..369f17b90 100755
--- a/hack/changelog.sh
+++ b/hack/changelog.sh
@@ -18,6 +18,8 @@ set -o errexit
 set -o nounset
 set -o pipefail
 
+function join { local IFS="$1"; shift; echo "$*"; }
+
 CHANGELOG_PATH='changelogs/unreleased'
 UNRELEASED=$(ls -t ${CHANGELOG_PATH})
 echo -e "Generating CHANGELOG markdown from ${CHANGELOG_PATH}\n"
@@ -25,7 +27,9 @@ for entry in $UNRELEASED
 do
     IFS=$'-' read -ra pruser <<<"$entry"
     contents=$(cat ${CHANGELOG_PATH}/${entry})
-    echo "  * ${contents} (#${pruser[0]}, @${pruser[1]})"
+    pr=${pruser[0]}
+    user=$(join '-' ${pruser[@]:1})
+    echo "  * ${contents} (#${pr}, @${user})"
 done
 echo -e "\nCopy and paste the list above in to the appropriate CHANGELOG file."
 echo "Be sure to run: git rm ${CHANGELOG_PATH}/*"