diff --git a/config/ChangeLog b/config/ChangeLog
index 250c3ff6a..1b9b27356 100644
--- a/config/ChangeLog
+++ b/config/ChangeLog
@@ -1,3 +1,8 @@
+2007-03-23  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* acx.m4 (ACX_BUGURL): Replace "@" with "@@" for
+	REPORT_BUGS_TEXI.
+
 2007-03-23  Joseph Myers  <joseph@codesourcery.com>
 
 	* acx.m4 (ACX_PKGVERSION, ACX_BUGURL): Define.
diff --git a/config/acx.m4 b/config/acx.m4
index 73afe8d70..b8676fc7a 100644
--- a/config/acx.m4
+++ b/config/acx.m4
@@ -585,7 +585,7 @@ AC_DEFUN([ACX_BUGURL],[
 	   ;;
      esac],
      REPORT_BUGS_TO="<$1>"
-     REPORT_BUGS_TEXI="@uref{$1}"
+     REPORT_BUGS_TEXI="@uref{`echo $1 | sed 's/@/@@/g'`}"
   )
   AC_SUBST(REPORT_BUGS_TO)
   AC_SUBST(REPORT_BUGS_TEXI)