diff --git a/converters/osm2pgrouting/Makefile b/converters/osm2pgrouting/Makefile
index 63b38db9d8e5..cad9e563cb9a 100644
--- a/converters/osm2pgrouting/Makefile
+++ b/converters/osm2pgrouting/Makefile
@@ -1,31 +1,31 @@
 PORTNAME=	osm2pgrouting
 DISTVERSIONPREFIX=	v
-DISTVERSION=	2.3.7
+DISTVERSION=	2.3.8
 CATEGORIES=	converters databases geography
 
 MAINTAINER=	lbartoletti@FreeBSD.org
 COMMENT=	Import OSM data into pgRouting database
 
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 LIB_DEPENDS=	libboost_system.so:devel/boost-libs \
 		libexpat.so:textproc/expat2 \
 		libpqxx.so:databases/postgresql-libpqxx
 
 USES=		cmake compiler:c++17-lang pgsql
 USE_GITHUB=	yes
 GH_ACCOUNT=	pgRouting
 
 WANT_PGSQL=	client
 
 OPTIONS_DEFINE=	DOCS
 
 PORTDOCS=	README.md
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|/usr/share/osm2pgrouting/mapconfig.xml|${PREFIX}/etc/${PORTNAME}/mapconfig.xml|' \
 		${WRKSRC}/src/utilities/prog_options.cpp \
 		${WRKSRC}/README.md
 
 .include <bsd.port.mk>
diff --git a/converters/osm2pgrouting/distinfo b/converters/osm2pgrouting/distinfo
index 35bd7c03a19d..a2c802ccd55e 100644
--- a/converters/osm2pgrouting/distinfo
+++ b/converters/osm2pgrouting/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1612377637
-SHA256 (pgRouting-osm2pgrouting-v2.3.7_GH0.tar.gz) = afbe3ff74c9b9b7b1350362fc839e1466335d57f84941af19b5a663fd58aba0c
-SIZE (pgRouting-osm2pgrouting-v2.3.7_GH0.tar.gz) = 185875
+TIMESTAMP = 1622957337
+SHA256 (pgRouting-osm2pgrouting-v2.3.8_GH0.tar.gz) = e3a58bcacf0c8811e0dcf3cf3791a4a7cc5ea2a901276133eacf227b30fd8355
+SIZE (pgRouting-osm2pgrouting-v2.3.8_GH0.tar.gz) = 187051
diff --git a/converters/osm2pgrouting/files/patch-CMakeLists.txt b/converters/osm2pgrouting/files/patch-CMakeLists.txt
index b4fab2a0f483..36b7e13b5684 100644
--- a/converters/osm2pgrouting/files/patch-CMakeLists.txt
+++ b/converters/osm2pgrouting/files/patch-CMakeLists.txt
@@ -1,54 +1,34 @@
---- CMakeLists.txt.orig	2021-02-04 06:38:35 UTC
+--- CMakeLists.txt.orig	2021-06-06 05:46:00 UTC
 +++ CMakeLists.txt
-@@ -8,7 +8,8 @@ if ( ${CMAKE_SOURCE_DIR} STREQUAL ${CMAKE_BINARY_DIR} 
- endif()
+@@ -9,7 +9,8 @@ endif()
+ PROJECT(osm2pgrouting)
  
  LIST(APPEND CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake")
 -SET(SHARE_DIR "${CMAKE_INSTALL_PREFIX}/share/osm2pgrouting")
 +SET(DOC_DIR "${CMAKE_INSTALL_PREFIX}/share/doc/osm2pgrouting")
 +SET(ETC_DIR "${CMAKE_INSTALL_PREFIX}/etc/osm2pgrouting")
  
- FIND_PACKAGE(PostgreSQL REQUIRED)
- find_package(LibPQXX REQUIRED)
-@@ -37,6 +38,7 @@ include(CheckCXXCompilerFlag)
- CHECK_CXX_COMPILER_FLAG("-std=c++0x" COMPILER_SUPPORTS_CXX0X)
- CHECK_CXX_COMPILER_FLAG("-std=c++11" COMPILER_SUPPORTS_CXX11)
- CHECK_CXX_COMPILER_FLAG("-std=c++14" COMPILER_SUPPORTS_CXX14)
-+CHECK_CXX_COMPILER_FLAG("-std=c++17" COMPILER_SUPPORTS_CXX17)
- if("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU")
-     if (CMAKE_CXX_COMPILER_VERSION VERSION_LESS GNU_CXX_MINIMUM_VERSION)
-         message(FATAL_ERROR "GCC version must be at least ${GNU_CXX_MINIMUM_VERSION}!
-@@ -50,7 +52,10 @@ else()
-     message(STATUS "Unknown compiler minimum version for ${CMAKE_CXX_COMPILER_ID}")
- endif()
- 
--if(COMPILER_SUPPORTS_CXX14)
-+if(COMPILER_SUPPORTS_CXX17)
-+    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++17")
-+    message(STATUS "Using  -std=c++17.")
-+elseif(COMPILER_SUPPORTS_CXX14)
-     set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++14")
-     message(STATUS "Using  -std=c++14.")
- elseif(COMPILER_SUPPORTS_CXX11)
-@@ -114,14 +119,15 @@ if(WIN32)
+ find_package(PostgreSQL REQUIRED)
+ find_package(PQXX REQUIRED)
+@@ -92,14 +93,15 @@ if(WIN32)
  endif()
  
  INSTALL(FILES
 -    "${CMAKE_SOURCE_DIR}/COPYING"
      "${CMAKE_SOURCE_DIR}/README.md"
 -    "${CMAKE_SOURCE_DIR}/mapconfig.xml"
 -    "${CMAKE_SOURCE_DIR}/mapconfig_for_cars.xml"
 -    "${CMAKE_SOURCE_DIR}/mapconfig_for_bicycles.xml"
 -    "${CMAKE_SOURCE_DIR}/mapconfig_for_pedestrian.xml"
 -    DESTINATION "${SHARE_DIR}")
 +    DESTINATION "${DOC_DIR}")
  
 +FOREACH(i mapconfig.xml mapconfig_for_cars.xml mapconfig_for_bicycles.xml mapconfig_for_pedestrian.xml)
 +    INSTALL(FILES
 +        "${CMAKE_SOURCE_DIR}/${i}"
 +        RENAME ${i}.sample
 +        DESTINATION "${ETC_DIR}")
 +ENDFOREACH()
  
  #INCLUDE_DIRECTORIES( ${Boost_INCLUDE_DIR} )
  #TARGET_LINK_LIBRARIES( osm2pgrouting ${Boost_LIBRARIES} )
diff --git a/converters/osm2pgrouting/files/patch-src_osm__elements_osm2pgrouting.cpp b/converters/osm2pgrouting/files/patch-src_osm__elements_osm2pgrouting.cpp
deleted file mode 100644
index bb451145328f..000000000000
--- a/converters/osm2pgrouting/files/patch-src_osm__elements_osm2pgrouting.cpp
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/osm_elements/osm2pgrouting.cpp.orig	2020-08-20 05:44:56 UTC
-+++ src/osm_elements/osm2pgrouting.cpp
-@@ -140,7 +140,7 @@ int main(int argc, char* argv[]) {
-                 cout << "Can't open database" << endl;
-                 return 1;
-             }
--            C.disconnect ();
-+            C.close ();
-         }catch (const std::exception &e){
-             cerr << e.what() << std::endl;
-             return 1;