diff --git a/textproc/luceneplusplus/Makefile b/textproc/luceneplusplus/Makefile
index b2fad379ac3..3f44024405c 100644
--- a/textproc/luceneplusplus/Makefile
+++ b/textproc/luceneplusplus/Makefile
@@ -1,7 +1,7 @@
 V =		3.0.8
 PKGNAME =	luceneplusplus-${V}
 COMMENT =	C++ port of the Java Lucene library, the text search engine
-REVISION =	4
+REVISION =	5
 
 GH_ACCOUNT =	luceneplusplus
 GH_PROJECT =	LucenePlusPlus
@@ -15,10 +15,10 @@ CATEGORIES =	textproc
 # LGPL3
 PERMIT_PACKAGE =	Yes
 
-WANTLIB += ${COMPILER_LIBCXX} m
-WANTLIB += boost_atomic-mt boost_chrono-mt boost_date_time-mt
-WANTLIB += boost_filesystem-mt boost_iostreams-mt boost_regex-mt
-WANTLIB += boost_thread-mt z boost_random-mt
+WANTLIB += ${COMPILER_LIBCXX} boost_atomic-mt boost_chrono-mt
+WANTLIB += boost_container-mt boost_date_time-mt boost_filesystem-mt
+WANTLIB += boost_iostreams-mt boost_random-mt boost_regex-mt boost_thread-mt
+WANTLIB += m z
 
 COMPILER =		base-clang ports-gcc
 
diff --git a/textproc/luceneplusplus/patches/patch-cmake_dependencies_cmake b/textproc/luceneplusplus/patches/patch-cmake_dependencies_cmake
new file mode 100644
index 00000000000..fe22a76740a
--- /dev/null
+++ b/textproc/luceneplusplus/patches/patch-cmake_dependencies_cmake
@@ -0,0 +1,13 @@
+luceneplusplus: fix build with Boost 1.91
+
+Index: cmake/dependencies.cmake
+--- cmake/dependencies.cmake.orig
++++ cmake/dependencies.cmake
+@@ -7,7 +7,6 @@ find_package(Boost COMPONENTS
+   filesystem
+   iostreams
+   regex
+-  system
+   thread
+   REQUIRED
+ )
diff --git a/textproc/luceneplusplus/patches/patch-src_contrib_CMakeLists_txt b/textproc/luceneplusplus/patches/patch-src_contrib_CMakeLists_txt
index 166c4ba0e1f..3528d398a58 100644
--- a/textproc/luceneplusplus/patches/patch-src_contrib_CMakeLists_txt
+++ b/textproc/luceneplusplus/patches/patch-src_contrib_CMakeLists_txt
@@ -3,7 +3,15 @@ disable cotire as it's deprecated and breaks the build with newer libc++
 Index: src/contrib/CMakeLists.txt
 --- src/contrib/CMakeLists.txt.orig
 +++ src/contrib/CMakeLists.txt
-@@ -85,8 +85,6 @@ set_target_properties(lucene++
+@@ -61,7 +61,6 @@ target_link_libraries(lucene++-contrib
+     Boost::filesystem
+     Boost::iostreams
+     Boost::regex
+-    Boost::system
+     Boost::thread
+     ZLIB::ZLIB
+     lucene++::lucene++
+@@ -85,8 +84,6 @@ set_target_properties(lucene++
      VERSION ${lucene++_VERSION}
      SOVERSION ${lucene++_SOVERSION})
      
diff --git a/textproc/luceneplusplus/patches/patch-src_core_CMakeLists_txt b/textproc/luceneplusplus/patches/patch-src_core_CMakeLists_txt
index a3b5bac8bdc..33f53e29594 100644
--- a/textproc/luceneplusplus/patches/patch-src_core_CMakeLists_txt
+++ b/textproc/luceneplusplus/patches/patch-src_core_CMakeLists_txt
@@ -3,13 +3,21 @@ disable cotire as it's deprecated and breaks the build with newer libc++
 Index: src/core/CMakeLists.txt
 --- src/core/CMakeLists.txt.orig
 +++ src/core/CMakeLists.txt
-@@ -79,9 +79,6 @@ set_target_properties(lucene++
+@@ -57,7 +57,6 @@ target_link_libraries(lucene++
+     Boost::filesystem
+     Boost::iostreams
+     Boost::regex
+-    Boost::system
+     Boost::thread
+     ZLIB::ZLIB
+ )
+@@ -78,9 +77,6 @@ set_target_properties(lucene++
+     VISIBILITY_INLINES_HIDDEN 1
      VERSION ${lucene++_VERSION}
      SOVERSION ${lucene++_SOVERSION})
- 
+-
 -cotire(lucene++)
 -
--
+ 
  install(TARGETS lucene++
    DESTINATION "${LIB_DESTINATION}"
-   COMPONENT runtime)
diff --git a/textproc/luceneplusplus/patches/patch-src_demo_deletefiles_CMakeLists_txt b/textproc/luceneplusplus/patches/patch-src_demo_deletefiles_CMakeLists_txt
new file mode 100644
index 00000000000..7e3602615aa
--- /dev/null
+++ b/textproc/luceneplusplus/patches/patch-src_demo_deletefiles_CMakeLists_txt
@@ -0,0 +1,11 @@
+Index: src/demo/deletefiles/CMakeLists.txt
+--- src/demo/deletefiles/CMakeLists.txt.orig
++++ src/demo/deletefiles/CMakeLists.txt
+@@ -38,7 +38,6 @@ target_link_libraries(deletefiles
+     Boost::filesystem
+     Boost::iostreams
+     Boost::regex
+-    Boost::system
+     Boost::thread
+     ZLIB::ZLIB
+     lucene++::lucene++
diff --git a/textproc/luceneplusplus/patches/patch-src_demo_indexfiles_CMakeLists_txt b/textproc/luceneplusplus/patches/patch-src_demo_indexfiles_CMakeLists_txt
new file mode 100644
index 00000000000..f9a61510a1b
--- /dev/null
+++ b/textproc/luceneplusplus/patches/patch-src_demo_indexfiles_CMakeLists_txt
@@ -0,0 +1,11 @@
+Index: src/demo/indexfiles/CMakeLists.txt
+--- src/demo/indexfiles/CMakeLists.txt.orig
++++ src/demo/indexfiles/CMakeLists.txt
+@@ -39,7 +39,6 @@ target_link_libraries(indexfiles
+     Boost::filesystem
+     Boost::iostreams
+     Boost::regex
+-    Boost::system
+     Boost::thread
+     ZLIB::ZLIB
+     lucene++::lucene++
diff --git a/textproc/luceneplusplus/patches/patch-src_demo_searchfiles_CMakeLists_txt b/textproc/luceneplusplus/patches/patch-src_demo_searchfiles_CMakeLists_txt
new file mode 100644
index 00000000000..0c769672ae8
--- /dev/null
+++ b/textproc/luceneplusplus/patches/patch-src_demo_searchfiles_CMakeLists_txt
@@ -0,0 +1,11 @@
+Index: src/demo/searchfiles/CMakeLists.txt
+--- src/demo/searchfiles/CMakeLists.txt.orig
++++ src/demo/searchfiles/CMakeLists.txt
+@@ -38,7 +38,6 @@ target_link_libraries(searchfiles
+     Boost::filesystem
+     Boost::iostreams
+     Boost::regex
+-    Boost::system
+     Boost::thread
+     ZLIB::ZLIB
+     lucene++::lucene++
diff --git a/textproc/luceneplusplus/patches/patch-src_test_CMakeLists_txt b/textproc/luceneplusplus/patches/patch-src_test_CMakeLists_txt
index 50c9d59086f..dcb927e791c 100644
--- a/textproc/luceneplusplus/patches/patch-src_test_CMakeLists_txt
+++ b/textproc/luceneplusplus/patches/patch-src_test_CMakeLists_txt
@@ -3,7 +3,15 @@ disable cotire as it's deprecated and breaks the build with newer libc++
 Index: src/test/CMakeLists.txt
 --- src/test/CMakeLists.txt.orig
 +++ src/test/CMakeLists.txt
-@@ -77,5 +77,3 @@ target_link_libraries(lucene++-tester
+@@ -63,7 +63,6 @@ target_link_libraries(lucene++-tester
+     Boost::filesystem
+     Boost::iostreams
+     Boost::regex
+-    Boost::system
+     Boost::thread
+     ZLIB::ZLIB
+     gtest_main
+@@ -77,5 +76,3 @@ target_link_libraries(lucene++-tester
  # link args
  ####################################
  target_compile_options(lucene++-tester PRIVATE -DLPP_EXPOSE_INTERNAL)