diff --git a/converters/osm2pgsql/Makefile b/converters/osm2pgsql/Makefile
index 8d0253f6c20b..478b01eaf2e9 100644
--- a/converters/osm2pgsql/Makefile
+++ b/converters/osm2pgsql/Makefile
@@ -1,70 +1,69 @@
 PORTNAME=	osm2pgsql
-PORTVERSION=	1.11.0
-PORTREVISION=	2
+PORTVERSION=	2.0.0
 CATEGORIES=	converters geography
 
 MAINTAINER=	amdmi3@FreeBSD.org
 COMMENT=	Convert OSM XML data to PostgreSQL database
 WWW=		https://osm2pgsql.org/ \
 		https://wiki.openstreetmap.org/wiki/Osm2pgsql \
 		https://github.com/openstreetmap/osm2pgsql
 
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 NOT_FOR_ARCHS=	armv7 i386 powerpc
 NOT_FOR_ARCHS_REASON=	needs a 64 bit architecture
 
 LIB_DEPENDS=	libproj.so:graphics/proj \
-		libboost_system.so:devel/boost-libs \
 		libexpat.so:textproc/expat2
 BUILD_DEPENDS=	${LOCALBASE}/include/osmium/version.hpp:astro/libosmium \
 		${LOCALBASE}/include/protozero/version.hpp:devel/protozero \
 		${LOCALBASE}/include/nlohmann/json.hpp:devel/nlohmann-json \
-		${LOCALBASE}/include/CLI/Version.hpp:devel/cli11
+		${LOCALBASE}/include/CLI/Version.hpp:devel/cli11 \
+		${LOCALBASE}/include/boost/geometry.hpp:devel/boost-libs
 
 USES=		cmake compiler:c++17-lang pgsql python:run shebangfix
 USE_GITHUB=	yes
 GH_ACCOUNT=	openstreetmap
 SHEBANG_FILES=	scripts/osm2pgsql-replication
 CMAKE_ON=	CMAKE_DISABLE_FIND_PACKAGE_Git \
 		EXTERNAL_LIBOSMIUM \
 		EXTERNAL_PROTOZERO \
 		EXTERNAL_CLI11
 #		EXTERNAL_FMT  # XXX: does not build with libfmt 9.x from ports, so use bundled version until upstream fixes
 CMAKE_ARGS=	-DLUA_EXE="${LOCALBASE}/bin/${LUA_CMD}"
 
 PORTDOCS=	AUTHORS CONTRIBUTING.md README.md
 PORTDATA=	*
 
 OPTIONS_DEFINE=	DOCS LUAJIT TEST # GEN (utility built with this option is not installed)
 OPTIONS_DEFAULT=GEN
 
 LUAJIT_DESC=		Build with LuaJIT support
 LUAJIT_CMAKE_BOOL=	WITH_LUAJIT
 LUAJIT_USES=		luajit lua:54:build  # lua is needed just for running tests
 LUAJIT_USES_OFF=	lua:54
 TEST_CMAKE_BOOL=	BUILD_TESTS
 TEST_TEST_TARGET=	test
 TEST_CMAKE_ON=		-DCMAKE_CTEST_ARGUMENTS="--label-regex;NoDB;--output-on-failure"
 TEST_BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}behave>=0:devel/py-behave@${PY_FLAVOR}
 TEST_TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}behave>=0:devel/py-behave@${PY_FLAVOR}
 #GEN_DESC=		Build experimental osm2pgsql-gen data generalization utility
 #GEN_LIB_DEPENDS=	libpotrace.so:graphics/libpotrace \
 			#libopencv_core.so:graphics/opencv
 #GEN_CMAKE_BOOL=		BUILD_GEN
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|find_package(Lua |&${LUA_VER} EXACT |' \
 		${WRKSRC}/CMakeLists.txt
 # for post-patch-GEN-off: when GEN option is implemented
 	@${REINPLACE_CMD} -Ee '/find_(path|library)/ s,(potrace|opencv),no&,' \
 		${WRKSRC}/CMakeLists.txt
 
 post-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 .for f in ${PORTDOCS}
 	${INSTALL_DATA} ${WRKSRC}/${f} ${STAGEDIR}${DOCSDIR}/
 .endfor
 
 .include <bsd.port.mk>
diff --git a/converters/osm2pgsql/distinfo b/converters/osm2pgsql/distinfo
index d9f27f95afc8..a43023cf98cc 100644
--- a/converters/osm2pgsql/distinfo
+++ b/converters/osm2pgsql/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1709050981
-SHA256 (openstreetmap-osm2pgsql-1.11.0_GH0.tar.gz) = 6b46313813b816f15ce906c04cd4108bbb05362740e0a1a8889055f4e25977d2
-SIZE (openstreetmap-osm2pgsql-1.11.0_GH0.tar.gz) = 2722008
+TIMESTAMP = 1726776348
+SHA256 (openstreetmap-osm2pgsql-2.0.0_GH0.tar.gz) = 05c2355b4a59d03a0f9855b4234a3bdc717b078faee625e73357947d1a82fe89
+SIZE (openstreetmap-osm2pgsql-2.0.0_GH0.tar.gz) = 2712209
diff --git a/converters/osm2pgsql/files/patch-CMakeLists.txt b/converters/osm2pgsql/files/patch-CMakeLists.txt
index 0e047aebe443..a51af717ff99 100644
--- a/converters/osm2pgsql/files/patch-CMakeLists.txt
+++ b/converters/osm2pgsql/files/patch-CMakeLists.txt
@@ -1,18 +1,18 @@
---- CMakeLists.txt.orig	2023-11-07 15:25:19 UTC
+--- CMakeLists.txt.orig	2024-09-19 13:10:47 UTC
 +++ CMakeLists.txt
-@@ -28,6 +28,7 @@ endif()
+@@ -28,6 +28,7 @@ option(BUILD_COVERAGE "Build with coverage" OFF)
  
  option(BUILD_TESTS    "Build test suite" OFF)
  option(BUILD_COVERAGE "Build with coverage" OFF)
-+option(BUILD_GEN      "Build gen" OFF)
- option(WITH_LUA       "Build with Lua support" ON)
++option(BUILD_GEN      "Build osm2pgsql-gen" OFF)
  option(WITH_LUAJIT    "Build with LuaJIT support" OFF)
+ option(WITH_PROJ      "Build with Projection support" ON)
  
-@@ -289,7 +290,6 @@ if (${POTRACE_LIBRARY} STREQUAL "POTRACE_LIBRARY-NOTFO
+@@ -253,7 +254,6 @@ else()
+     message(STATUS "Did not find opencv and/or potrace library. Not building osm2pgsql-gen.")
  else()
-     if (WITH_LUA)
-         message(STATUS "Found opencv and potrace library. Building osm2pgsql-gen.")
--        set(BUILD_GEN 1)
-         include_directories(SYSTEM ${POTRACE_INCLUDE_DIR})
-         add_executable(osm2pgsql-gen src/gen/osm2pgsql-gen.cpp
-                     src/gen/canvas.cpp
+     message(STATUS "Found opencv and potrace library. Building osm2pgsql-gen.")
+-    set(BUILD_GEN 1)
+     include_directories(SYSTEM ${POTRACE_INCLUDE_DIR})
+     add_executable(osm2pgsql-gen src/gen/osm2pgsql-gen.cpp
+                 src/gen/canvas.cpp