diff --git a/editors/bee-host/Makefile b/editors/bee-host/Makefile
index 029b3a3d1348..8568d2a6bb60 100644
--- a/editors/bee-host/Makefile
+++ b/editors/bee-host/Makefile
@@ -1,27 +1,30 @@
 PORTNAME=	bee-host
-DISTVERSION=	1.4.2
+DISTVERSION=	1.5.1
 CATEGORIES=	editors www
 
 MAINTAINER=	thierry@FreeBSD.org
 COMMENT=	Host application for Browser's Exernal Editor extension
 WWW=		https://github.com/rosmanov/bee-host
 
 LICENSE=	MIT
 
 LIB_DEPENDS=	libuv.so:devel/libuv	\
 		libcjson.so:devel/libcjson
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	rosmanov
 
 USES=		cmake:noninja localbase:ldflags shebangfix
 SHEBANG_GLOB=	*.sh
 LDFLAGS+=	-lcjson -lcjson_utils -luv
 CMAKE_ARGS=	-DCMAKE_DOC_DIR:PATH=${DOCSDIR_REL}
 
 OPTIONS_DEFINE=	DOCS
 
 pre-configure:
 	${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE:C|/||}|' ${WRKSRC}/vars.sh
 
+post-stage:
+	${RM} -rf ${STAGEDIR}/usr/lib64
+
 .include <bsd.port.mk>
diff --git a/editors/bee-host/distinfo b/editors/bee-host/distinfo
index 4f842ebbb494..e4eb0bc4a440 100644
--- a/editors/bee-host/distinfo
+++ b/editors/bee-host/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1763312409
-SHA256 (rosmanov-bee-host-1.4.2_GH0.tar.gz) = 6ff0de87105d6d7ab60def29ccab438a20f73936b2ef80e00f24eb6ba1a7c359
-SIZE (rosmanov-bee-host-1.4.2_GH0.tar.gz) = 37916
+TIMESTAMP = 1784636690
+SHA256 (rosmanov-bee-host-1.5.1_GH0.tar.gz) = 101a9726daad972610b017f788c3a3acd126fb9de551f467d390f464d2f2cb49
+SIZE (rosmanov-bee-host-1.5.1_GH0.tar.gz) = 47745
diff --git a/editors/bee-host/files/patch-CMakeLists.txt b/editors/bee-host/files/patch-CMakeLists.txt
index 5295ebf1a6c6..61a6d6ebf4a9 100644
--- a/editors/bee-host/files/patch-CMakeLists.txt
+++ b/editors/bee-host/files/patch-CMakeLists.txt
@@ -1,134 +1,144 @@
---- CMakeLists.txt.orig	2025-06-08 19:16:44 UTC
+--- CMakeLists.txt.orig	2026-07-18 10:09:58 UTC
 +++ CMakeLists.txt
-@@ -43,94 +43,10 @@ set(EXTERNAL_DIR ${CMAKE_CURRENT_BINARY_DIR}/external)
- 
- set(EXTERNAL_DIR ${CMAKE_CURRENT_BINARY_DIR}/external)
- 
--set(cjson_cmake_args
--    -DCMAKE_INSTALL_PREFIX:PATH=<INSTALL_DIR>
--    -DBUILD_SHARED_AND_STATIC_LIBS=On
--    -DBUILD_SHARED_LIBS=Off
--    -DENABLE_CJSON_TEST=Off
--    -DENABLE_CJSON_UTILS=On
--    -DENABLE_TARGET_EXPORT=On
--    -DCMAKE_POLICY_VERSION_MINIMUM=3.5
--    -DCMAKE_C_COMPILER=${CMAKE_C_COMPILER}
+@@ -127,117 +127,8 @@ function(setup_external_dependencies)
+ #       BEECTL_LIBUV_INCLUDE_DIRS, BEECTL_CJSON_INCLUDE_DIRS,
+ #       BEECTL_EXTERNAL_TARGETS (list of targets)
+ function(setup_external_dependencies)
+-  message(STATUS "Downloading and building libuv and cJSON from source")
+-
+-  # Configure cJSON build
+-  set(cjson_cmake_args
+-      -DCMAKE_INSTALL_PREFIX:PATH=<INSTALL_DIR>
+-      -DBUILD_SHARED_AND_STATIC_LIBS=On
+-      -DBUILD_SHARED_LIBS=Off
+-      -DENABLE_CJSON_TEST=Off
+-      -DENABLE_CJSON_UTILS=On
+-      -DENABLE_TARGET_EXPORT=On
+-      -DCMAKE_POLICY_VERSION_MINIMUM=3.5
+-      -DCMAKE_C_FLAGS=${CMAKE_C_FLAGS}
+-      -DCMAKE_CXX_FLAGS=${CMAKE_CXX_FLAGS}
+-      -DCMAKE_EXE_LINKER_FLAGS=${CMAKE_EXE_LINKER_FLAGS}
+-      -DCMAKE_SHARED_LINKER_FLAGS=${CMAKE_SHARED_LINKER_FLAGS}
+-      -DCMAKE_SYSTEM_NAME=${CMAKE_SYSTEM_NAME}
+-      -DCMAKE_OSX_ARCHITECTURES=${CMAKE_OSX_ARCHITECTURES}
+-  )
+-  if(CMAKE_TOOLCHAIN_FILE)
+-    list(APPEND cjson_cmake_args
+-      -DCMAKE_TOOLCHAIN_FILE:FILEPATH=${CMAKE_TOOLCHAIN_FILE}
+-    )
+-  endif()
+-  if(CMAKE_MSVC_RUNTIME_LIBRARY)
+-    list(APPEND cjson_cmake_args
+-      -DCMAKE_POLICY_DEFAULT_CMP0091=NEW
+-      -DCMAKE_MSVC_RUNTIME_LIBRARY=${CMAKE_MSVC_RUNTIME_LIBRARY}
+-    )
+-  endif()
+-  if(uppercase_CMAKE_SYSTEM_NAME MATCHES WINDOWS)
+-      list(APPEND cjson_cmake_args -DWIN32=ON)
+-  endif()
+-
+-  ExternalProject_Add(cjson
+-    GIT_REPOSITORY "https://github.com/DaveGamble/cJSON"
+-    GIT_TAG "v1.7.18"
+-    PREFIX "${EXTERNAL_DIR}/cJSON"
+-    BUILD_IN_SOURCE 1
+-    TEST_COMMAND ""
+-    INSTALL_COMMAND ""
+-    CMAKE_ARGS ${cjson_cmake_args}
+-  )
+-  ExternalProject_Get_Property(cjson source_dir)
+-  ExternalProject_Get_Property(cjson binary_dir)
+-  ExternalProject_Get_Property(cjson download_dir)
+-  set(CJSON_SOURCE_DIR "${source_dir}")
+-  set(CJSON_BINARY_DIR "${binary_dir}")
+-  set(CJSON_DOWNLOAD_DIR "${download_dir}")
+-  if(MSVC)
+-      set(CJSON_STATIC_NAME "$<CONFIG>/libcjson.lib")
+-  else()
+-      set(CJSON_STATIC_NAME "libcjson.a")
+-  endif()
+-  set(CJSON_STATIC_LIB "${CJSON_BINARY_DIR}/${CJSON_STATIC_NAME}")
+-
+-  # Configure libuv build
+-  set(LIBUV_TAG v1.51.0)
+-  set(libuv_cmake_args
+-    -DCMAKE_SYSTEM_NAME=${CMAKE_SYSTEM_NAME}
+-    -DCMAKE_SYSTEM_PROCESSOR=${CMAKE_SYSTEM_PROCESSOR}
 -    -DCMAKE_CXX_COMPILER=${CMAKE_CXX_COMPILER}
--    -DCMAKE_C_FLAGS=${CMAKE_C_FLAGS}
 -    -DCMAKE_CXX_FLAGS=${CMAKE_CXX_FLAGS}
 -    -DCMAKE_EXE_LINKER_FLAGS=${CMAKE_EXE_LINKER_FLAGS}
--    -DCMAKE_SHARED_LINKER_FLAGS=${CMAKE_SHARED_LINKER_FLAGS}
--    -DCMAKE_SYSTEM_NAME=${CMAKE_SYSTEM_NAME}
+-    -DCMAKE_INSTALL_PREFIX=<INSTALL_DIR>
+-    -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}
+-    -DLIBUV_BUILD_TESTS=OFF
+-    -DLIBUV_BUILD_EXAMPLES=OFF
+-    -DLIBUV_INSTALL=OFF
+-    -DCMAKE_POSITION_INDEPENDENT_CODE=ON
 -    -DCMAKE_OSX_ARCHITECTURES=${CMAKE_OSX_ARCHITECTURES}
--)
--if(uppercase_CMAKE_SYSTEM_NAME MATCHES WINDOWS)
--    list(APPEND cjson_cmake_args -DWIN32=ON)
--endif()
-+# cJSON and cJSONUtils installed from devel/libcjso
- 
--ExternalProject_Add(cjson
--  GIT_REPOSITORY "https://github.com/DaveGamble/cJSON"
--  GIT_TAG "v1.7.18"
--  PREFIX "${EXTERNAL_DIR}/cJSON"
--  BUILD_IN_SOURCE 1
--  TEST_COMMAND ""
--  INSTALL_COMMAND ""
--  CMAKE_ARGS ${cjson_cmake_args}
--)
--ExternalProject_Get_Property(cjson source_dir)
--ExternalProject_Get_Property(cjson binary_dir)
--ExternalProject_Get_Property(cjson download_dir)
--set(CJSON_SOURCE_DIR "${source_dir}")
--set(CJSON_BINARY_DIR "${binary_dir}")
--set(CJSON_DOWNLOAD_DIR "${download_dir}")
--if (CMAKE_C_COMPILER_ID STREQUAL "MSVC")
--    set(CJSON_STATIC_NAME "cjson.lib")
--else()
--    set(CJSON_STATIC_NAME "libcjson.a")
--endif()
--# Full path to the expected built static lib
--set(CJSON_STATIC_LIB "${CJSON_BINARY_DIR}/${CJSON_STATIC_NAME}")
-+# libuv installed from devel/libuv
- 
--set(LIBUV_TAG v1.51.0)
--set(EXTERNAL_DIR ${CMAKE_CURRENT_BINARY_DIR}/external)
+-  )
+-  if(CMAKE_TOOLCHAIN_FILE)
+-    list(APPEND libuv_cmake_args
+-      -DCMAKE_TOOLCHAIN_FILE:FILEPATH=${CMAKE_TOOLCHAIN_FILE}
+-    )
+-  endif()
+-  if(CMAKE_MSVC_RUNTIME_LIBRARY)
+-    list(APPEND libuv_cmake_args
+-      -DCMAKE_POLICY_DEFAULT_CMP0091=NEW
+-      -DCMAKE_MSVC_RUNTIME_LIBRARY=${CMAKE_MSVC_RUNTIME_LIBRARY}
+-    )
+-  endif()
+-  if(uppercase_CMAKE_SYSTEM_NAME MATCHES WINDOWS)
+-    list(APPEND libuv_cmake_args -DWIN32=ON)
+-  endif()
 -
--set(libuv_cmake_args
--  -DCMAKE_SYSTEM_NAME=${CMAKE_SYSTEM_NAME}
--  -DCMAKE_SYSTEM_PROCESSOR=${CMAKE_SYSTEM_PROCESSOR}
--  -DCMAKE_C_COMPILER=${CMAKE_C_COMPILER}
--  -DCMAKE_C_FLAGS=${CMAKE_C_FLAGS}
--  -DCMAKE_CXX_COMPILER=${CMAKE_CXX_COMPILER}
--  -DCMAKE_CXX_FLAGS=${CMAKE_CXX_FLAGS}
--  -DCMAKE_EXE_LINKER_FLAGS=${CMAKE_EXE_LINKER_FLAGS}
--  -DCMAKE_INSTALL_PREFIX=<INSTALL_DIR>
--  -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}
--  -DLIBUV_BUILD_TESTS=OFF
--  -DLIBUV_BUILD_EXAMPLES=OFF
--  -DLIBUV_INSTALL=OFF
--  -DCMAKE_POSITION_INDEPENDENT_CODE=ON
--  -DCMAKE_OSX_ARCHITECTURES=${CMAKE_OSX_ARCHITECTURES}
--)
--# Append UV_DISABLE_CLOCK_GETTIME only for Windows
--if(uppercase_CMAKE_SYSTEM_NAME MATCHES WINDOWS)
--  list(APPEND libuv_cmake_args -DWIN32=ON)
--endif()
+-  ExternalProject_Add(libuv_ep
+-    GIT_REPOSITORY "https://github.com/libuv/libuv.git"
+-    GIT_TAG "${LIBUV_TAG}"
+-    PREFIX "${EXTERNAL_DIR}/libuv"
+-    CMAKE_ARGS ${libuv_cmake_args}
+-    INSTALL_COMMAND ""
+-    TEST_COMMAND ""
+-  )
+-  ExternalProject_Get_Property(libuv_ep source_dir)
+-  ExternalProject_Get_Property(libuv_ep binary_dir)
+-  set(LIBUV_SOURCE_DIR "${source_dir}")
+-  set(LIBUV_BINARY_DIR "${binary_dir}")
+-  if(MSVC)
+-      set(LIBUV_STATIC_NAME "$<CONFIG>/libuv.lib")
+-  else()
+-      set(LIBUV_STATIC_NAME "libuv.a")
+-  endif()
+-  set(LIBUV_STATIC_LIB "${LIBUV_BINARY_DIR}/${LIBUV_STATIC_NAME}")
 -
--ExternalProject_Add(libuv_ep
--  GIT_REPOSITORY "https://github.com/libuv/libuv.git"
--  GIT_TAG "${LIBUV_TAG}"
--  PREFIX "${EXTERNAL_DIR}/libuv"
--  CMAKE_ARGS ${libuv_cmake_args}
--  INSTALL_COMMAND ""
--  TEST_COMMAND ""
--)
--ExternalProject_Get_Property(libuv_ep source_dir)
--ExternalProject_Get_Property(libuv_ep binary_dir)
--set(LIBUV_SOURCE_DIR "${source_dir}")
--set(LIBUV_BINARY_DIR "${binary_dir}")
--if (CMAKE_C_COMPILER_ID STREQUAL "MSVC")
--    set(LIBUV_STATIC_NAME "uv.lib")
--else()
--    set(LIBUV_STATIC_NAME "libuv.a")
--endif()
--# Full path to the expected built static lib
--set(LIBUV_STATIC_LIB "${LIBUV_BINARY_DIR}/${LIBUV_STATIC_NAME}")
--
- # beectl
- set(BEECTL_SRCS
-   src/beectl.c
-@@ -189,8 +105,6 @@ set_property(TARGET beectl PROPERTY C_STANDARD 11) # C
- endif()
- 
- set_property(TARGET beectl PROPERTY C_STANDARD 11) # C11
--add_dependencies(beectl cjson)
--add_dependencies(beectl libuv_ep)
- 
- # The following would be better approach than including cJSON files in our
- # source list. But the build fails when cross-compiling, since
-@@ -233,14 +147,14 @@ set(BEECTL_MANIFEST_TARGET_PATH "${CMAKE_INSTALL_PREFI
+-  # Set standardized output variables for parent scope
+-  set(BEECTL_LIBUV_LIBRARIES "${LIBUV_STATIC_LIB}" PARENT_SCOPE)
+-  set(BEECTL_CJSON_LIBRARIES "${CJSON_STATIC_LIB}" PARENT_SCOPE)
+-  set(BEECTL_LIBUV_INCLUDE_DIRS "${LIBUV_SOURCE_DIR}/include" PARENT_SCOPE)
+-  set(BEECTL_CJSON_INCLUDE_DIRS "${CJSON_DOWNLOAD_DIR}" PARENT_SCOPE)
+-  set(BEECTL_EXTERNAL_TARGETS "cjson;libuv_ep" PARENT_SCOPE)
++# cJSON and cJSONUtils installed from devel/libcjson
++# libuv installed from devel/libuv
+ endfunction()
  
- message(STATUS "CMAKE_INSTALL_PREFIX: ${CMAKE_INSTALL_PREFIX}")
- set(BEECTL_MANIFEST_TARGET_PATH "${CMAKE_INSTALL_PREFIX}/bin/beectl")
--set(BEECTL_CHROME_MANIFEST_DIR "etc/opt/chrome/native-messaging-hosts")
-+set(BEECTL_CHROME_MANIFEST_DIR "etc/chrome/native-messaging-hosts")
- set(BEECTL_CHROMIUM_MANIFEST_DIR "etc/chromium/native-messaging-hosts")
+ # ============================================================================
+@@ -326,7 +217,7 @@ if(BEECTL_EXTERNAL_TARGETS)
  
- if(uppercase_CMAKE_SYSTEM_NAME MATCHES LINUX AND CMAKE_SYSTEM_PROCESSOR MATCHES "^(amd|x86_)64$")
-     # Fedora 36 amd64 may have a separate /usr/lib64 dir different from /usr/lib.
-     set(BEECTL_FIREFOX_MANIFEST_DIR "usr/lib64/mozilla/native-messaging-hosts")
- else()
--    set(BEECTL_FIREFOX_MANIFEST_DIR "usr/lib/mozilla/native-messaging-hosts")
-+    set(BEECTL_FIREFOX_MANIFEST_DIR "lib/mozilla/native-messaging-hosts")
+ # Add external project dependencies if any (empty for system deps)
+ if(BEECTL_EXTERNAL_TARGETS)
+-  add_dependencies(beectl ${BEECTL_EXTERNAL_TARGETS})
++  #add_dependencies(beectl ${BEECTL_EXTERNAL_TARGETS})
  endif()
  
- # RPM package properties
-@@ -416,7 +330,7 @@ else(uppercase_CMAKE_SYSTEM_NAME MATCHES WINDOWS)
-         COMPONENT config)
- else(uppercase_CMAKE_SYSTEM_NAME MATCHES WINDOWS)
-     # Install host app
--    install(TARGETS beectl RUNTIME DESTINATION usr/local/bin COMPONENT applications)
-+    install(TARGETS beectl RUNTIME DESTINATION bin COMPONENT applications)
- 
-     configure_file(
-         chrome-com.ruslan_osmanov.bee.json.in
+ # ExternalProject_Add() creates an independent CMake invocation.
+@@ -391,9 +282,9 @@ else()
+     # On Linux/UNIX, use absolute system-wide paths if installing to a standard prefix.
+     # Otherwise, use relative paths to support custom installation sandboxes and relocatable TGZ packaging.
+     if(BEECTL_STANDARD_PREFIX)
+-        set(default_chrome_manifest_dir "/etc/opt/chrome/native-messaging-hosts")
+-        set(default_chromium_manifest_dir "/etc/chromium/native-messaging-hosts")
+-        set(default_firefox_manifest_dir "/usr/lib/mozilla/native-messaging-hosts")
++        set(default_chrome_manifest_dir "etc/chrome/native-messaging-hosts")
++        set(default_chromium_manifest_dir "etc/chromium/native-messaging-hosts")
++        set(default_firefox_manifest_dir "lib/mozilla/native-messaging-hosts")
+         set(default_firefox_manifest_dir_alt "/usr/lib64/mozilla/native-messaging-hosts")
+         
+         if(CMAKE_INSTALL_PREFIX STREQUAL "/")