diff --git a/tools/i18n/makepot.php b/tools/i18n/makepot.php
index bf4b528485..65c706d58f 100644
--- a/tools/i18n/makepot.php
+++ b/tools/i18n/makepot.php
@@ -108,14 +108,14 @@ class MakePOT {
 		),
 		'wp-plugin' => array(
 			'description' => 'Translation of the WordPress plugin {name} {version} by {author}',
-			'msgid-bugs-address' => 'http://wordpress.org/tag/{slug}',
+			'msgid-bugs-address' => 'http://wordpress.org/support/plugin/{slug}',
 			'copyright-holder' => '{author}',
 			'package-name' => '{name}',
 			'package-version' => '{version}',
 		),
 		'wp-theme' => array(
 			'description' => 'Translation of the WordPress theme {name} {version} by {author}',
-			'msgid-bugs-address' => 'http://wordpress.org/tags/{slug}',
+			'msgid-bugs-address' => 'http://wordpress.org/support/theme/{slug}',
 			'copyright-holder' => '{author}',
 			'package-name' => '{name}',
 			'package-version' => '{version}',