diff --git a/ChangeLog b/ChangeLog
index ca212df9..7e31f190 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2009-10-10  Tatsuhiro Tsujikawa  <t-tujikawa@users.sourceforge.net>
+
+	Use PACKAGE_BUGREPORT and PACKAGE_URL.
+	* src/version_usage.cc
+
 2009-10-10  Tatsuhiro Tsujikawa  <t-tujikawa@users.sourceforge.net>
 
 	Quoted localedir
diff --git a/src/version_usage.cc b/src/version_usage.cc
index ad7d51b1..ef286d85 100644
--- a/src/version_usage.cc
+++ b/src/version_usage.cc
@@ -71,8 +71,8 @@ void showVersion() {
 	    << MessageDigestContext::getSupportedAlgoString() << "\n"
 #endif // ENABLE_MESSAGE_DIGEST
 	    << "\n"
-	    << StringFormat(_("Report bugs to %s"), "<tujikawa at users dot sourceforge dot net>")
-	    << std::endl;
+	    << StringFormat(_("Report bugs to %s"), PACKAGE_BUGREPORT) << "\n"
+	    << "Visit " << PACKAGE_URL << std::endl;
 }
 
 void showUsage(const std::string& keyword, const OptionParser& oparser) {