diff --git a/databases/mongodb34-rocks/Makefile b/databases/mongodb34-rocks/Makefile
index f81c82604934..7be47895818f 100644
--- a/databases/mongodb34-rocks/Makefile
+++ b/databases/mongodb34-rocks/Makefile
@@ -20,7 +20,6 @@ LICENSE=	AGPLv3 APACHE20
 LICENSE_COMB=	multi
 
 BROKEN=		fails to link
-BROKEN=		fails to build with boost 1.66, see bug 224091
 
 ONLY_FOR_ARCHS=	amd64
 ONLY_FOR_ARCHS_REASON=	"Only supported on amd64 (i386 deprecated in v3)"
diff --git a/databases/mongodb34-rocks/files/patch-src_mongo_db_repl_oplog__fetcher.cpp b/databases/mongodb34-rocks/files/patch-src_mongo_db_repl_oplog__fetcher.cpp
new file mode 100644
index 000000000000..d63c3754d5ea
--- /dev/null
+++ b/databases/mongodb34-rocks/files/patch-src_mongo_db_repl_oplog__fetcher.cpp
@@ -0,0 +1,14 @@
+Drop unnecessary use of boost::make_optional
+https://jira.mongodb.org/browse/SERVER-32516
+
+--- src/mongo/db/repl/oplog_fetcher.cpp.orig	2017-09-07 19:28:48 UTC
++++ src/mongo/db/repl/oplog_fetcher.cpp
+@@ -265,7 +265,7 @@ StatusWith<boost::optional<rpc::OplogQueryMetadata>> p
+         if (!metadataResult.isOK()) {
+             return metadataResult.getStatus();
+         }
+-        oqMetadata = boost::make_optional<rpc::OplogQueryMetadata>(metadataResult.getValue());
++        oqMetadata = metadataResult.getValue();
+     }
+     return oqMetadata;
+ }
diff --git a/databases/mongodb34/Makefile b/databases/mongodb34/Makefile
index 1aad98c5b8df..83362fe9acfb 100644
--- a/databases/mongodb34/Makefile
+++ b/databases/mongodb34/Makefile
@@ -18,7 +18,6 @@ COMMENT=	Distributed document-oriented "NoSQL" database
 LICENSE=	AGPLv3 APACHE20
 LICENSE_COMB=	multi
 
-BROKEN=		fails to build with boost 1.66, see bug 224090
 ONLY_FOR_ARCHS=	amd64
 ONLY_FOR_ARCHS_REASON=	"Only supported on amd64 (i386 deprecated in v3)"
 
diff --git a/databases/mongodb34/files/patch-src_mongo_db_repl_oplog__fetcher.cpp b/databases/mongodb34/files/patch-src_mongo_db_repl_oplog__fetcher.cpp
new file mode 100644
index 000000000000..d63c3754d5ea
--- /dev/null
+++ b/databases/mongodb34/files/patch-src_mongo_db_repl_oplog__fetcher.cpp
@@ -0,0 +1,14 @@
+Drop unnecessary use of boost::make_optional
+https://jira.mongodb.org/browse/SERVER-32516
+
+--- src/mongo/db/repl/oplog_fetcher.cpp.orig	2017-09-07 19:28:48 UTC
++++ src/mongo/db/repl/oplog_fetcher.cpp
+@@ -265,7 +265,7 @@ StatusWith<boost::optional<rpc::OplogQueryMetadata>> p
+         if (!metadataResult.isOK()) {
+             return metadataResult.getStatus();
+         }
+-        oqMetadata = boost::make_optional<rpc::OplogQueryMetadata>(metadataResult.getValue());
++        oqMetadata = metadataResult.getValue();
+     }
+     return oqMetadata;
+ }