diff --git a/converters/osm2pgsql/Makefile b/converters/osm2pgsql/Makefile
index 9c11d65179dc..ee88fbdbee33 100644
--- a/converters/osm2pgsql/Makefile
+++ b/converters/osm2pgsql/Makefile
@@ -1,60 +1,56 @@
 PORTNAME=	osm2pgsql
-PORTVERSION=	1.7.2
-PORTREVISION=	3
+PORTVERSION=	1.8.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
 
 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/rapidjson/stringbuffer.h:devel/rapidjson
+		${LOCALBASE}/include/protozero/version.hpp:devel/protozero
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	openstreetmap
 
 USES=		cmake compiler:c++17-lang pgsql python:run shebangfix
 SHEBANG_FILES=	scripts/osm2pgsql-replication
 CMAKE_ON=	CMAKE_DISABLE_FIND_PACKAGE_Git \
 		EXTERNAL_LIBOSMIUM \
-		EXTERNAL_PROTOZERO \
-		EXTERNAL_RAPIDJSON
+		EXTERNAL_PROTOZERO
 #		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
 
 LUAJIT_DESC=		Build with LuaJIT support
 LUAJIT_CMAKE_BOOL=	WITH_LUAJIT
-LUAJIT_LIB_DEPENDS=	libluajit-5.1.so:lang/luajit
-LUAJIT_USES=		lua:54:build  # just for running tests in fact
+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}
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|find_package(Lua |&${LUA_VER} EXACT |' \
 		${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 aefe25f14771..b1ccb6a123cc 100644
--- a/converters/osm2pgsql/distinfo
+++ b/converters/osm2pgsql/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1668181735
-SHA256 (openstreetmap-osm2pgsql-1.7.2_GH0.tar.gz) = 94c72ceb3c401c816499339f8765c62efbf40685a798dcdf9a4bf7dbedf6c7a5
-SIZE (openstreetmap-osm2pgsql-1.7.2_GH0.tar.gz) = 2627913
+TIMESTAMP = 1675081473
+SHA256 (openstreetmap-osm2pgsql-1.8.0_GH0.tar.gz) = b266b50f46fe4d1caddab61d26b39f10ea33b896ec23b8b3e294be4666e7b927
+SIZE (openstreetmap-osm2pgsql-1.8.0_GH0.tar.gz) = 2544929
diff --git a/converters/osm2pgsql/files/patch-CMakeLists.txt b/converters/osm2pgsql/files/patch-CMakeLists.txt
index d94e7ed7a4b7..85ffb9b888f4 100644
--- a/converters/osm2pgsql/files/patch-CMakeLists.txt
+++ b/converters/osm2pgsql/files/patch-CMakeLists.txt
@@ -1,20 +1,20 @@
 --- CMakeLists.txt.orig	2022-11-10 19:15:49 UTC
 +++ CMakeLists.txt
 @@ -173,7 +173,7 @@ if (NOT EXTERNAL_PROTOZERO)
  endif()
  
  if (NOT EXTERNAL_FMT)
 -    set(FMT_INCLUDE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/contrib/fmt/include")
 +	include_directories("${CMAKE_CURRENT_SOURCE_DIR}/contrib/fmt/include")
  endif()
  
  if (NOT EXTERNAL_RAPIDJSON)
 @@ -183,7 +183,7 @@ endif()
  include_directories(${CMAKE_CURRENT_SOURCE_DIR}/src ${CMAKE_CURRENT_BINARY_DIR})
  
  find_package(Osmium 2.17.3 REQUIRED COMPONENTS io)
--include_directories(SYSTEM ${OSMIUM_INCLUDE_DIRS} ${PROTOZERO_INCLUDE_DIR} ${FMT_INCLUDE_DIR} ${RAPIDJSON_INCLUDE_DIR})
-+include_directories(SYSTEM ${OSMIUM_INCLUDE_DIRS} ${PROTOZERO_INCLUDE_DIR} ${RAPIDJSON_INCLUDE_DIR})
+-include_directories(SYSTEM ${OSMIUM_INCLUDE_DIRS} ${PROTOZERO_INCLUDE_DIR} ${FMT_INCLUDE_DIR})
++include_directories(SYSTEM ${OSMIUM_INCLUDE_DIRS} ${PROTOZERO_INCLUDE_DIR})
  
  if (WITH_LUA)
      if (WITH_LUAJIT)