diff --git a/sunrise-commit b/sunrise-commit
index 1396f94..0918a69 100755
--- a/sunrise-commit
+++ b/sunrise-commit
@@ -180,8 +180,9 @@ main() {
 					echo
 					local bn
 					for bn in ${bns}; do
-						wget -q http://bugs.gentoo.org/show_bug.cgi?id=12345 -O - \
-							| sed -e 's; *<title>Gentoo Bug \([0-9]*\) - \(.*\)</title>;Bug \1: \2;gp' -e d 
+						wget -q http://bugs.gentoo.org/show_bug.cgi?id=${bn} -O - \
+							| sed -e 's; *<title>Gentoo Bug \([0-9]*\) - \(.*\)</title>;Bug \1: \2;p' \
+								-e "s; *<title>Gentoo \(Invalid Bug ID\)</title>;Bug ${bn}: !! \1;p" -e d 
 					done
 					echo
 				fi