diff --git a/doc/optional.html b/doc/optional.html
index b9ef36b..cc0628c 100644
--- a/doc/optional.html
+++ b/doc/optional.html
@@ -1798,6 +1798,6 @@ T <u>is not</u> required to be <a href="http://www.sgi.com/tech/stl/DefaultConst
 License, Version 1.0. (See accompanying file <a href="../../../LICENSE_1_0.txt">LICENSE_1_0.txt</a> or copy at <a href="http://www.boost.org/LICENSE_1_0.txt">www.boost.org/LICENSE_1_0.txt</a>)</p>
 <P>Developed by <A HREF="mailto:fernando_cacciola@hotmail.com">Fernando Cacciola</A>,
 the latest version of this file can be found at <A
-HREF="http://www.boost.org">www.boost.org</A>, and the boost <A HREF="http://www.boost.org/more/mailing_lists.htm#main">discussion lists</A></P>
+HREF="http://www.boost.org">www.boost.org</A>, and the boost <A HREF="http://beta.boost.org/community/groups.html#main">discussion lists</A></P>
 </pre></BODY>
 </HTML>
\ No newline at end of file
diff --git a/doc/optional.qbk b/doc/optional.qbk
index 388f686..bfd0e33 100644
--- a/doc/optional.qbk
+++ b/doc/optional.qbk
@@ -22,7 +22,7 @@ Distributed under the Boost Software License, Version 1.0.
 [/ Cited Boost resources ]
 
 [def __BOOST_VARIANT__ [@../../../variant/index.html Boost.Variant]]
-[def __BOOST_TRIBOOL__ [@../../../tribool/index.html boost::tribool]]
+[def __BOOST_TRIBOOL__ [@../../../../doc/html/tribool.html boost::tribool]]
 
 [def __OPTIONAL_POINTEE__ [@../../../utility/OptionalPointee.html OptionalPointee]]
 [def __COPY_CONSTRUCTIBLE__ [@../../../utility/CopyConstructible.html Copy Constructible]]