diff --git a/editors/imhex/Makefile b/editors/imhex/Makefile
index 9bb85ff7d62e..ddb4c17a2630 100644
--- a/editors/imhex/Makefile
+++ b/editors/imhex/Makefile
@@ -1,60 +1,63 @@
 PORTNAME=	imhex
-PORTVERSION=	1.8.0
+PORTVERSION=	1.8.1
 DISTVERSIONPREFIX=	v
 CATEGORIES=	editors
 MASTER_SITES=	https://git.sr.ht/~danyspin97/xdgpp/blob/f01f810714443d0f10c333d4d1d9c0383be41375/:xdg
 DISTFILES=	xdg.hpp:xdg
 DIST_SUBDIR=	imhex
 
 MAINTAINER=	nobutaka@FreeBSD.org
 COMMENT=	Hex editor for reverse engineers and programmers
 
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 NOT_FOR_ARCHS=	i386
 NOT_FOR_ARCHS_REASON=	__uint128_t and __int128_t are not supported
 EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX} \
 		btzy-nativefiledialog-extended-${GH_TAG_NATIVEFILEDIALOG}_GH0${EXTRACT_SUFX} \
 		fmtlib-fmt-${GH_TAG_FMT}_GH0${EXTRACT_SUFX} \
 		VirusTotal-yara-${GH_TAG_YARA}_GH0${EXTRACT_SUFX}
 
 BUILD_DEPENDS=	glm>0:math/glm \
 		nlohmann-json>0:devel/nlohmann-json
 LIB_DEPENDS=	libcapstone.so:devel/capstone4 \
 		libcurl.so:ftp/curl \
-		libmbedtls.so:security/mbedtls \
 		libfreetype.so:print/freetype2 \
 		libglfw.so:graphics/glfw \
+		libharfbuzz.so:print/harfbuzz \
+		libmbedtls.so:security/mbedtls \
 		libtre.so:textproc/libtre
 
 USES=		cmake pkgconfig python:3.8+ xorg
 USE_GNOME=	cairo gdkpixbuf2 gtk30
 USE_XORG=	x11 xcb xau xdmcp
 USE_GITHUB=	yes
 
 GH_ACCOUNT=	WerWolv
 GH_PROJECT=	ImHex
 GH_TUPLE=	btzy:nativefiledialog-extended:${GH_TAG_NATIVEFILEDIALOG}:nativefiledialog \
 		fmtlib:fmt:${GH_TAG_FMT}:fmt \
 		VirusTotal:yara:${GH_TAG_YARA}:yara
 GH_TAG_FMT=	6271406
 GH_TAG_NATIVEFILEDIALOG=	300203a
 GH_TAG_YARA=	1842271
 
+CMAKE_ARGS=	-DUSE_SYSTEM_CURL=ON
+
 PORTDOCS=	README.md
 
 OPTIONS_DEFINE=	DOCS NLS
 NLS_USES=	gettext
 
 post-extract:
 	${CP} ${DISTDIR}/${DIST_SUBDIR}/xdg.hpp ${WRKSRC}/external/xdgpp
 	${CP} -R ${WRKSRC_fmt}/* ${WRKSRC}/external/fmt
 	${CP} -R ${WRKSRC_nativefiledialog}/* ${WRKSRC}/external/nativefiledialog
 	${CP} -R ${WRKSRC_yara}/* ${WRKSRC}/external/yara/yara
 
 post-install-DOCS-on:
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/README.md ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>
diff --git a/editors/imhex/distinfo b/editors/imhex/distinfo
index 0bcddc3387bf..f25932b43bde 100644
--- a/editors/imhex/distinfo
+++ b/editors/imhex/distinfo
@@ -1,11 +1,11 @@
-TIMESTAMP = 1621439913
+TIMESTAMP = 1621959882
 SHA256 (imhex/xdg.hpp) = 2e08ce74adb71ff9b9aa9e1c999733fccd4b00967b9cf0c0e51dbf049392a9ec
 SIZE (imhex/xdg.hpp) = 7674
-SHA256 (imhex/WerWolv-ImHex-v1.8.0_GH0.tar.gz) = 8a130a8b8c7a8d699bf621ba768098b19a01866ba2ee634376f8883bd39d703a
-SIZE (imhex/WerWolv-ImHex-v1.8.0_GH0.tar.gz) = 1757395
+SHA256 (imhex/WerWolv-ImHex-v1.8.1_GH0.tar.gz) = f70cb238d3db75530e30b72cac586ffad975123e9478dae967be0086e57f9edd
+SIZE (imhex/WerWolv-ImHex-v1.8.1_GH0.tar.gz) = 1758664
 SHA256 (imhex/btzy-nativefiledialog-extended-300203a_GH0.tar.gz) = 5db23b09fb098fa44cae663a5f2b38fc679dbf0a7acf9a8425500c9942478624
 SIZE (imhex/btzy-nativefiledialog-extended-300203a_GH0.tar.gz) = 400036
 SHA256 (imhex/fmtlib-fmt-6271406_GH0.tar.gz) = f07b01d4f092318f3da39d404f7cafbca311e7b576f09121adb1a54927826410
 SIZE (imhex/fmtlib-fmt-6271406_GH0.tar.gz) = 778679
 SHA256 (imhex/VirusTotal-yara-1842271_GH0.tar.gz) = a7148c3ddbc80746f60d56e0ecbbecc05c5f5401263ba95571aaf65dcaa75175
 SIZE (imhex/VirusTotal-yara-1842271_GH0.tar.gz) = 935600
diff --git a/editors/imhex/files/patch-plugins_libimhex_CMakeLists.txt b/editors/imhex/files/patch-plugins_libimhex_CMakeLists.txt
deleted file mode 100644
index 33020c1e8737..000000000000
--- a/editors/imhex/files/patch-plugins_libimhex_CMakeLists.txt
+++ /dev/null
@@ -1,19 +0,0 @@
---- plugins/libimhex/CMakeLists.txt.orig	2021-05-18 19:25:59 UTC
-+++ plugins/libimhex/CMakeLists.txt
-@@ -12,8 +12,6 @@ set(XDGPP_INCLUDE_DIRS "${CMAKE_CURRENT_SOURCE_DIR}/..
- set(CMAKE_USE_MBEDTLS ON)
- set(BUILD_CURL_EXE OFF)
- set(FPHSA_NAME_MISMATCHED ON CACHE BOOL "")
--add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/../../external/curl ${CMAKE_CURRENT_BINARY_DIR}/external/curl EXCLUDE_FROM_ALL)
--set_target_properties(libcurl PROPERTIES POSITION_INDEPENDENT_CODE ON)
- 
- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIC")
- 
-@@ -64,5 +62,5 @@ if (APPLE)
-     find_library(FOUNDATION NAMES Foundation)
-     target_link_libraries(libimhex PUBLIC imgui nlohmann_json mbedcrypto ${FOUNDATION} nfd fmt-header-only libcurl)
- else ()
--    target_link_libraries(libimhex PUBLIC imgui nlohmann_json mbedcrypto nfd fmt-header-only libcurl)
-+    target_link_libraries(libimhex PUBLIC imgui nlohmann_json mbedcrypto nfd fmt-header-only curl)
- endif ()
-\ No newline at end of file