diff --git a/.devcontainer b/.devcontainer
index 67ba29e63e0..734f91b27d5 160000
--- a/.devcontainer
+++ b/.devcontainer
@@ -1 +1 @@
-Subproject commit 67ba29e63e008035d449ef51eeb0e953dacddf54
+Subproject commit 734f91b27d5024e19f7945efc565929fc5c788ee
diff --git a/.github/release-tag.json b/.github/release-tag.json
index 911b419cb4e..2fe911cce9f 100644
--- a/.github/release-tag.json
+++ b/.github/release-tag.json
@@ -1,4 +1,4 @@
 {
-  "message": "xpro version 1.3.0.4 tag",
-  "tag": "xpv1.3.0.4"
+  "message": "xpro version 1.3.0.5 tag",
+  "tag": "xpv1.3.0.5"
 }
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 1969a2fbaaa..f478069f2c4 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -36,13 +36,13 @@ INCLUDE(EnableWarnings)
 set(targetsFile ${PROJECT_NAME}-targets)
 if(COMMAND xpExternPackage)
   set(CMAKE_OPT_INSTALL FALSE)
-  set(USE_CMAKE_ICONV ON)
+  set(USE_LIBICONV ON)
   if(NOT DEFINED CMAKE_INSTALL_CMAKEDIR)
     set(CMAKE_INSTALL_CMAKEDIR ${CMAKE_INSTALL_DATADIR}/cmake)
   endif()
 else()
   set(CMAKE_OPT_INSTALL TRUE)
-  set(USE_CMAKE_ICONV OFF)
+  set(USE_LIBICONV OFF)
   set(CMAKE_INSTALL_CMAKEDIR ${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME})
 endif()
 
@@ -324,12 +324,6 @@ IF(BUILD_FUZZERS)
 ENDIF()
 
 if(COMMAND xpExternPackage)
-  string(JOIN "\n" EXT1
-    "if(APPLE)"
-    "  find_package(Iconv REQUIRED)"
-    "endif()"
-    ""
-    )
   xpExternPackage(TARGETS_FILE ${targetsFile}
     LIBRARIES git2 DEFAULT_TARGETS git2
     BASE v${CMAKE_PROJECT_VERSION} XPDIFF "patch"
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index d9312b007d5..86ab2f85735 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -282,13 +282,15 @@ INCLUDE(SelectGSSAPI)
 
 # Optional external dependency: iconv
 IF (USE_ICONV)
-	if(USE_CMAKE_ICONV)
+	if(USE_LIBICONV)
 		list(REMOVE_ITEM CMAKE_MODULE_PATH "${libgit2_SOURCE_DIR}/cmake/")
-		find_package(Iconv)
+		# libiconv::libiconv avoids hard-coded build system paths in targetsFile
+		find_package(libiconv)
 		list(APPEND CMAKE_MODULE_PATH "${libgit2_SOURCE_DIR}/cmake/")
-		include(FindIconv) # populate the ICONV_* variables
-		# Iconv_INCLUDE_DIR (cmake) and ICONV_INCLUDE_DIR (libgit2)
-		# are assumed to be the same below... it was true on my system
+		if(libiconv_FOUND)
+			set(ICONV_FOUND ${libiconv_FOUND})
+			set(ICONV_LIBRARIES ${LIBICONV_LIBRARIES})
+		endif()
 	else()
 	FIND_PACKAGE(Iconv)
 	endif()
@@ -296,12 +298,7 @@ ENDIF()
 IF (ICONV_FOUND)
 	SET(GIT_USE_ICONV 1)
 	LIST(APPEND LIBGIT2_SYSTEM_INCLUDES ${ICONV_INCLUDE_DIR})
-	if(USE_CMAKE_ICONV AND TARGET Iconv::Iconv)
-		# Iconv::Iconv avoids hard-coded build system paths in targetsFile
-		list(APPEND LIBGIT2_LIBS Iconv::Iconv)
-	else()
 	LIST(APPEND LIBGIT2_LIBS ${ICONV_LIBRARIES})
-	endif()
 	LIST(APPEND LIBGIT2_PC_LIBS ${ICONV_LIBRARIES})
 ENDIF()
 ADD_FEATURE_INFO(iconv GIT_USE_ICONV "iconv encoding conversion support")