diff --git a/doc/91_relnotes.qbk b/doc/91_relnotes.qbk
index 82dad14..3c1736a 100644
--- a/doc/91_relnotes.qbk
+++ b/doc/91_relnotes.qbk
@@ -11,6 +11,10 @@
 
 [section:relnotes Release Notes]
 
+[heading Boost Release 1.77]
+
+* Fixed [@https://github.com/boostorg/optional/issues/92 issue #92].
+
 [heading Boost Release 1.76]
 
 * Fixed MSVC warning C4702.
diff --git a/doc/html/boost_optional/relnotes.html b/doc/html/boost_optional/relnotes.html
index f973c6d..560e728 100644
--- a/doc/html/boost_optional/relnotes.html
+++ b/doc/html/boost_optional/relnotes.html
@@ -28,6 +28,15 @@
 </h2></div></div></div>
 <h4>
 <a name="boost_optional.relnotes.h0"></a>
+      <span class="phrase"><a name="boost_optional.relnotes.boost_release_1_77"></a></span><a class="link" href="relnotes.html#boost_optional.relnotes.boost_release_1_77">Boost
+      Release 1.77</a>
+    </h4>
+<div class="itemizedlist"><ul class="itemizedlist" style="list-style-type: disc; "><li class="listitem">
+          Fixed <a href="https://github.com/boostorg/optional/issues/92" target="_top">issue
+          #92</a>.
+        </li></ul></div>
+<h4>
+<a name="boost_optional.relnotes.h1"></a>
       <span class="phrase"><a name="boost_optional.relnotes.boost_release_1_76"></a></span><a class="link" href="relnotes.html#boost_optional.relnotes.boost_release_1_76">Boost
       Release 1.76</a>
     </h4>
@@ -35,7 +44,7 @@
           Fixed MSVC warning C4702.
         </li></ul></div>
 <h4>
-<a name="boost_optional.relnotes.h1"></a>
+<a name="boost_optional.relnotes.h2"></a>
       <span class="phrase"><a name="boost_optional.relnotes.boost_release_1_75"></a></span><a class="link" href="relnotes.html#boost_optional.relnotes.boost_release_1_75">Boost
       Release 1.75</a>
     </h4>
@@ -49,7 +58,7 @@
         </li>
 </ul></div>
 <h4>
-<a name="boost_optional.relnotes.h2"></a>
+<a name="boost_optional.relnotes.h3"></a>
       <span class="phrase"><a name="boost_optional.relnotes.boost_release_1_73"></a></span><a class="link" href="relnotes.html#boost_optional.relnotes.boost_release_1_73">Boost
       Release 1.73</a>
     </h4>
@@ -72,7 +81,7 @@
         </li>
 </ul></div>
 <h4>
-<a name="boost_optional.relnotes.h3"></a>
+<a name="boost_optional.relnotes.h4"></a>
       <span class="phrase"><a name="boost_optional.relnotes.boost_release_1_69"></a></span><a class="link" href="relnotes.html#boost_optional.relnotes.boost_release_1_69">Boost
       Release 1.69</a>
     </h4>
@@ -90,7 +99,7 @@
         </li>
 </ul></div>
 <h4>
-<a name="boost_optional.relnotes.h4"></a>
+<a name="boost_optional.relnotes.h5"></a>
       <span class="phrase"><a name="boost_optional.relnotes.boost_release_1_68"></a></span><a class="link" href="relnotes.html#boost_optional.relnotes.boost_release_1_68">Boost
       Release 1.68</a>
     </h4>
@@ -107,7 +116,7 @@
         </li>
 </ul></div>
 <h4>
-<a name="boost_optional.relnotes.h5"></a>
+<a name="boost_optional.relnotes.h6"></a>
       <span class="phrase"><a name="boost_optional.relnotes.boost_release_1_67"></a></span><a class="link" href="relnotes.html#boost_optional.relnotes.boost_release_1_67">Boost
       Release 1.67</a>
     </h4>
@@ -121,7 +130,7 @@
         </li>
 </ul></div>
 <h4>
-<a name="boost_optional.relnotes.h6"></a>
+<a name="boost_optional.relnotes.h7"></a>
       <span class="phrase"><a name="boost_optional.relnotes.boost_release_1_66"></a></span><a class="link" href="relnotes.html#boost_optional.relnotes.boost_release_1_66">Boost
       Release 1.66</a>
     </h4>
@@ -139,7 +148,7 @@
         </li>
 </ul></div>
 <h4>
-<a name="boost_optional.relnotes.h7"></a>
+<a name="boost_optional.relnotes.h8"></a>
       <span class="phrase"><a name="boost_optional.relnotes.boost_release_1_63"></a></span><a class="link" href="relnotes.html#boost_optional.relnotes.boost_release_1_63">Boost
       Release 1.63</a>
     </h4>
@@ -163,7 +172,7 @@
         </li>
 </ul></div>
 <h4>
-<a name="boost_optional.relnotes.h8"></a>
+<a name="boost_optional.relnotes.h9"></a>
       <span class="phrase"><a name="boost_optional.relnotes.boost_release_1_62"></a></span><a class="link" href="relnotes.html#boost_optional.relnotes.boost_release_1_62">Boost
       Release 1.62</a>
     </h4>
@@ -171,7 +180,7 @@
           Fixed <a href="https://svn.boost.org/trac/boost/ticket/12179" target="_top">Trac #12179</a>.
         </li></ul></div>
 <h4>
-<a name="boost_optional.relnotes.h9"></a>
+<a name="boost_optional.relnotes.h10"></a>
       <span class="phrase"><a name="boost_optional.relnotes.boost_release_1_61"></a></span><a class="link" href="relnotes.html#boost_optional.relnotes.boost_release_1_61">Boost
       Release 1.61</a>
     </h4>
@@ -214,7 +223,7 @@
         </li>
 </ul></div>
 <h4>
-<a name="boost_optional.relnotes.h10"></a>
+<a name="boost_optional.relnotes.h11"></a>
       <span class="phrase"><a name="boost_optional.relnotes.boost_release_1_60"></a></span><a class="link" href="relnotes.html#boost_optional.relnotes.boost_release_1_60">Boost
       Release 1.60</a>
     </h4>
@@ -225,7 +234,7 @@
           #11203</a>.
         </li></ul></div>
 <h4>
-<a name="boost_optional.relnotes.h11"></a>
+<a name="boost_optional.relnotes.h12"></a>
       <span class="phrase"><a name="boost_optional.relnotes.boost_release_1_59"></a></span><a class="link" href="relnotes.html#boost_optional.relnotes.boost_release_1_59">Boost
       Release 1.59</a>
     </h4>
@@ -239,7 +248,7 @@
         </li>
 </ul></div>
 <h4>
-<a name="boost_optional.relnotes.h12"></a>
+<a name="boost_optional.relnotes.h13"></a>
       <span class="phrase"><a name="boost_optional.relnotes.boost_release_1_58"></a></span><a class="link" href="relnotes.html#boost_optional.relnotes.boost_release_1_58">Boost
       Release 1.58</a>
     </h4>
@@ -275,7 +284,7 @@
         </li>
 </ul></div>
 <h4>
-<a name="boost_optional.relnotes.h13"></a>
+<a name="boost_optional.relnotes.h14"></a>
       <span class="phrase"><a name="boost_optional.relnotes.boost_release_1_57"></a></span><a class="link" href="relnotes.html#boost_optional.relnotes.boost_release_1_57">Boost
       Release 1.57</a>
     </h4>
@@ -285,7 +294,7 @@
           to fix C++03 compile error on <code class="computeroutput"><span class="identifier">logic_error</span><span class="special">(</span><span class="string">"..."</span><span class="special">)</span></code>"</em></span>.
         </li></ul></div>
 <h4>
-<a name="boost_optional.relnotes.h14"></a>
+<a name="boost_optional.relnotes.h15"></a>
       <span class="phrase"><a name="boost_optional.relnotes.boost_release_1_56"></a></span><a class="link" href="relnotes.html#boost_optional.relnotes.boost_release_1_56">Boost
       Release 1.56</a>
     </h4>
diff --git a/doc/html/index.html b/doc/html/index.html
index f97beec..98420b8 100644
--- a/doc/html/index.html
+++ b/doc/html/index.html
@@ -145,7 +145,7 @@
 </div>
 </div>
 <table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>
-<td align="left"><p><small>Last revised: December 18, 2020 at 22:54:39 GMT</small></p></td>
+<td align="left"><p><small>Last revised: May 19, 2021 at 21:27:41 GMT</small></p></td>
 <td align="right"><div class="copyright-footer"></div></td>
 </tr></table>
 <hr>
diff --git a/include/boost/optional/optional.hpp b/include/boost/optional/optional.hpp
index aadc975..1c30327 100644
--- a/include/boost/optional/optional.hpp
+++ b/include/boost/optional/optional.hpp
@@ -18,7 +18,9 @@
 #define BOOST_OPTIONAL_OPTIONAL_FLC_19NOV2002_HPP
 
 #include <new>
+#ifndef BOOST_NO_IOSTREAM
 #include <iosfwd>
+#endif // BOOST_NO_IOSTREAM
 
 #ifdef BOOST_OPTIONAL_DETAIL_USE_STD_TYPE_TRAITS
 #  include <type_traits>
@@ -1586,6 +1588,7 @@ get_pointer ( optional<T>& opt )
 
 } // namespace boost
 
+#ifndef BOOST_NO_IOSTREAM
 namespace boost {
 
 // The following declaration prevents a bug where operator safe-bool is used upon streaming optional object if you forget the IO header.
@@ -1598,6 +1601,7 @@ operator<<(std::basic_ostream<CharType, CharTrait>& os, optional_detail::optiona
 }
 
 } // namespace boost
+#endif // BOOST_NO_IOSTREAM
 
 #include <boost/optional/detail/optional_relops.hpp>
 #include <boost/optional/detail/optional_swap.hpp>
diff --git a/include/boost/optional/optional_io.hpp b/include/boost/optional/optional_io.hpp
index ce81b68..3db6dda 100644
--- a/include/boost/optional/optional_io.hpp
+++ b/include/boost/optional/optional_io.hpp
@@ -12,6 +12,7 @@
 #ifndef BOOST_OPTIONAL_OPTIONAL_IO_FLC_19NOV2002_HPP
 #define BOOST_OPTIONAL_OPTIONAL_IO_FLC_19NOV2002_HPP
 
+#ifndef BOOST_NO_IOSTREAM
 #include <istream>
 #include <ostream>
 
@@ -31,7 +32,7 @@ operator<<(std::basic_ostream<CharType, CharTrait>& out, none_t)
   {
     out << "--";
   }
-   
+
   return out;
 }
 
@@ -90,5 +91,5 @@ operator>>(std::basic_istream<CharType, CharTrait>& in, optional<T>& v)
 
 } // namespace boost
 
+#endif // BOOST_NO_IOSTREAM
 #endif
-
diff --git a/test/optional_test.cpp b/test/optional_test.cpp
index a0fa5a6..f5ca436 100644
--- a/test/optional_test.cpp
+++ b/test/optional_test.cpp
@@ -12,7 +12,9 @@
 // Revisions:
 // 12 May 2008 (added more swap tests)
 //
+#ifndef BOOST_NO_IOSTREAM
 #include<iostream>
+#endif // BOOST_NO_IOSTREAM
 #include<stdexcept>
 #include<string>
 
@@ -908,7 +910,7 @@ void test_no_implicit_conversions()
 
 
 // Test for support for classes with overridden operator&
-class CustomAddressOfClass  
+class CustomAddressOfClass
 {
     int n;
 
@@ -950,5 +952,3 @@ int main()
 
   return boost::report_errors();
 }
-
-
diff --git a/test/optional_test_io.cpp b/test/optional_test_io.cpp
index 14c2b26..8086c11 100644
--- a/test/optional_test_io.cpp
+++ b/test/optional_test_io.cpp
@@ -10,15 +10,19 @@
 // You are welcome to contact the author at:
 //  fernando_cacciola@hotmail.com
 
-#include <sstream>
 #include "boost/optional/optional.hpp"
 #include "boost/optional/optional_io.hpp"
+#include "boost/core/lightweight_test.hpp"
+
+#ifndef BOOST_NO_IOSTREAM
+
+#include <sstream>
 
 #ifdef BOOST_BORLANDC
 #pragma hdrstop
 #endif
 
-#include "boost/core/lightweight_test.hpp"
+
 
 using boost::optional;
 
@@ -29,7 +33,7 @@ void test2( Opt o, Opt buff )
 
   const int markv = 123 ;
   int mark = 0 ;
-  
+
   s << o << " " << markv ;
   s >> buff >> mark ;
 
@@ -85,3 +89,12 @@ int main()
 
   return boost::report_errors();
 }
+
+#else // BOOST_NO_IOSTREAM
+
+int main()
+{
+  return boost::report_errors();
+}
+
+#endif // BOOST_NO_IOSTREAM