diff --git a/doc/91_relnotes.qbk b/doc/91_relnotes.qbk
index ba94ef6..228760d 100644
--- a/doc/91_relnotes.qbk
+++ b/doc/91_relnotes.qbk
@@ -14,7 +14,7 @@
 [heading Boost Release 1.66]
 
 * On newer compilers `optional` is now trivially-copyable for scalar `T`s. This uses a different storage (just `T` rather than `aligned_storage`). We require the compiler to support defaulted functions.
-
+* Changed the implementation of `operator==` to get rid of the `-Wmaybe-uninitialized` false-positive warning from GCC. 
 
 [heading Boost Release 1.63]
 * Added two new in-place constructors. They work similarly to `emplace()` functions: they initialize the contained value by perfect-forwarding the obtained arguments. One constructor always initializes the contained value, the other based on a boolean condition.
diff --git a/doc/html/boost_optional/relnotes.html b/doc/html/boost_optional/relnotes.html
index 6cd8753..9881def 100644
--- a/doc/html/boost_optional/relnotes.html
+++ b/doc/html/boost_optional/relnotes.html
@@ -31,13 +31,19 @@
       <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>
-<div class="itemizedlist"><ul class="itemizedlist" style="list-style-type: disc; "><li class="listitem">
+<div class="itemizedlist"><ul class="itemizedlist" style="list-style-type: disc; ">
+<li class="listitem">
           On newer compilers <code class="computeroutput"><span class="identifier">optional</span></code>
           is now trivially-copyable for scalar <code class="computeroutput"><span class="identifier">T</span></code>s.
           This uses a different storage (just <code class="computeroutput"><span class="identifier">T</span></code>
           rather than <code class="computeroutput"><span class="identifier">aligned_storage</span></code>).
           We require the compiler to support defaulted functions.
-        </li></ul></div>
+        </li>
+<li class="listitem">
+          Changed the implementation of <code class="computeroutput"><span class="keyword">operator</span><span class="special">==</span></code> to get rid of the <code class="computeroutput"><span class="special">-</span><span class="identifier">Wmaybe</span><span class="special">-</span><span class="identifier">uninitialized</span></code> false-positive warning
+          from GCC.
+        </li>
+</ul></div>
 <h4>
 <a name="boost_optional.relnotes.h1"></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
diff --git a/doc/html/index.html b/doc/html/index.html
index cad53fb..37bbc28 100644
--- a/doc/html/index.html
+++ b/doc/html/index.html
@@ -146,7 +146,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: November 04, 2017 at 16:36:14 GMT</small></p></td>
+<td align="left"><p><small>Last revised: November 04, 2017 at 18:02:17 GMT</small></p></td>
 <td align="right"><div class="copyright-footer"></div></td>
 </tr></table>
 <hr>
diff --git a/include/boost/optional/detail/optional_relops.hpp b/include/boost/optional/detail/optional_relops.hpp
index 3f96117..2c17f2b 100644
--- a/include/boost/optional/detail/optional_relops.hpp
+++ b/include/boost/optional/detail/optional_relops.hpp
@@ -26,7 +26,7 @@ namespace boost {
 template<class T>
 inline
 bool operator == ( optional<T> const& x, optional<T> const& y )
-{ return equal_pointees(x,y); }
+{ return bool(x) && bool(y) ? *x == *y : bool(x) == bool(y); }
 
 template<class T>
 inline
diff --git a/test/optional_test_maybe_uninitialized_warning.cpp b/test/optional_test_maybe_uninitialized_warning.cpp
index 084834d..a9a0707 100644
--- a/test/optional_test_maybe_uninitialized_warning.cpp
+++ b/test/optional_test_maybe_uninitialized_warning.cpp
@@ -25,7 +25,7 @@ int main(int argc, const char *[])
   if (argc > 0)
     b = argc;
 
-  if (a != b)
+  if (a == b)
     return 1;
 
   return 0;