diff --git a/srcpkgs/osm2pgsql/patches/no-boost.patch b/srcpkgs/osm2pgsql/patches/no-boost.patch
new file mode 100644
index 00000000000..31bb4c83954
--- /dev/null
+++ b/srcpkgs/osm2pgsql/patches/no-boost.patch
@@ -0,0 +1,51 @@
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -201,7 +201,7 @@ if (WITH_LUA)
+     find_program(LUA_EXE lua)
+ endif()
+ 
+-find_package(Boost 1.50 REQUIRED COMPONENTS system filesystem)
++find_package(Boost 1.50 REQUIRED)
+ include_directories(SYSTEM ${Boost_INCLUDE_DIR})
+ 
+ find_package(PostgreSQL REQUIRED)
+--- a/src/output-flex.cpp
++++ b/src/output-flex.cpp
+@@ -36,7 +36,7 @@ extern "C"
+ #include <rapidjson/stringbuffer.h>
+ #include <rapidjson/writer.h>
+ 
+-#include <boost/filesystem.hpp>
++#include <filesystem>
+ 
+ #include <cassert>
+ #include <cstdlib>
+@@ -1633,7 +1633,7 @@ void output_flex_t::init_lua(std::string
+     luaX_add_table_int(lua_state(), "stage", 1);
+ 
+     std::string const dir_path =
+-        boost::filesystem::path{filename}.parent_path().string();
++        std::filesystem::path{filename}.parent_path().string();
+     luaX_add_table_str(lua_state(), "config_dir", dir_path.c_str());
+ 
+     luaX_add_table_func(lua_state(), "define_table",
+--- a/tests/common-cleanup.hpp
++++ b/tests/common-cleanup.hpp
+@@ -14,7 +14,7 @@
+ 
+ #include <string>
+ 
+-#include <boost/filesystem.hpp>
++#include <filesystem>
+ 
+ namespace testing {
+ namespace cleanup {
+@@ -46,7 +46,7 @@ private:
+         }
+ 
+         boost::system::error_code ec;
+-        boost::filesystem::remove(m_filename, ec);
++        std::filesystem::remove(m_filename, ec);
+         if (ec && warn) {
+             fmt::print(stderr, "WARNING: Unable to remove \"{}\": {}\n",
+                        m_filename, ec.message());
diff --git a/srcpkgs/osm2pgsql/template b/srcpkgs/osm2pgsql/template
index e24c1de1983..484318bd258 100644
--- a/srcpkgs/osm2pgsql/template
+++ b/srcpkgs/osm2pgsql/template
@@ -1,11 +1,11 @@
 # Template file for 'osm2pgsql'
 pkgname=osm2pgsql
 version=1.6.0
-revision=7
+revision=8
 build_style=cmake
-hostmakedepends="boost"
+configure_args="-DCMAKE_CXX_STANDARD=17"
 makedepends="expat-devel proj-devel bzip2-devel zlib-devel boost-devel-minimal
- libboost_filesystem postgresql-libs-devel lua53-devel"
+ postgresql-libs-devel lua53-devel"
 short_desc="Tool for loading OpenStreetMap data into a PostgreSQL database"
 maintainer="Nýx <n.y.x@bluewin.ch>"
 license="GPL-3.0-or-later"