diff --git a/srcpkgs/gpick/patches/boost-1.84.patch b/srcpkgs/gpick/patches/boost-1.84.patch
new file mode 100644
index 00000000000..d6e99803142
--- /dev/null
+++ b/srcpkgs/gpick/patches/boost-1.84.patch
@@ -0,0 +1,10 @@
+--- a/source/dynv/Types.cpp
++++ b/source/dynv/Types.cpp
+@@ -20,6 +20,7 @@
+ #include "Map.h"
+ #include "Color.h"
+ #include <algorithm>
++#include <boost/version.hpp>
+ #include <boost/endian/conversion.hpp>
+ namespace dynv {
+ namespace xml {
diff --git a/srcpkgs/gpick/patches/revert-cpp-lua.patch b/srcpkgs/gpick/patches/revert-cpp-lua.patch
index 09f13d368f1..cbaa4e67f7f 100644
--- a/srcpkgs/gpick/patches/revert-cpp-lua.patch
+++ b/srcpkgs/gpick/patches/revert-cpp-lua.patch
@@ -84,8 +84,7 @@ index bb6c670..f433c95 100644
  include(Version)
  configure_file("${CMAKE_CURRENT_SOURCE_DIR}/source/version/Version.cpp.in" "${CMAKE_CURRENT_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/Version.cpp" @ONLY)
  list(APPEND SOURCES "${CMAKE_CURRENT_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/Version.cpp")
--find_package(Boost 1.58 COMPONENTS unit_test_framework REQUIRED)
-+find_package(Boost 1.58 COMPONENTS filesystem system unit_test_framework REQUIRED)
+ find_package(Boost 1.58 COMPONENTS unit_test_framework REQUIRED)
  find_package(PkgConfig)
  if (PkgConfig_FOUND)
  	if (USE_GTK3)
@@ -152,15 +151,6 @@ index bb6c670..f433c95 100644
  set_compile_options(gpick-parser)
  target_include_directories(gpick-parser PRIVATE
  	source
-@@ -168,6 +167,8 @@ target_link_libraries(gpick PRIVATE
- 	gpick-lua
- 	gpick-parser
- 	gpick-common
-+	${Boost_FILESYSTEM_LIBRARY}
-+	${Boost_SYSTEM_LIBRARY}
- 	${Lua_LIBRARIES}
- 	${Expat_LIBRARIES}
- 	Threads::Threads
 diff --git a/README.md b/README.md
 index ac87f64..d3fdd73 100644
 --- a/README.md
@@ -187,15 +177,6 @@ index 79b3b30..0bb9783 100644
  	env.ConfirmLibs(conf, libs)
  	env.ConfirmBoost(conf, '1.71')
  	env = conf.Finish()
-@@ -292,6 +292,8 @@ def buildGpick(env):
- 		gpick_env.Append(LIBS = ['glib-2.0', 'gtk-win32-2.0', 'gobject-2.0', 'gdk-win32-2.0', 'cairo', 'gdk_pixbuf-2.0', 'lua5.2', 'expat2.1', 'pango-1.0', 'pangocairo-1.0', 'intl'])
- 		gpick_env.Append(LINKFLAGS = ['/SUBSYSTEM:WINDOWS', '/ENTRY:mainCRTStartup'], CPPDEFINES = ['XML_STATIC'])
- 		objects += buildWindowsResources(env)
-+	else:
-+		gpick_env.Append(LIBS = ['boost_filesystem', 'boost_system'])
- 
- 	if not gpick_env['BUILD_TARGET'] == 'win32':
- 		gpick_env.Append(LIBS = ['expat'])
 diff --git a/source/ColorSpaceType.cpp b/source/ColorSpaceType.cpp
 index 8f5d124..69e8fab 100644
 --- a/source/ColorSpaceType.cpp
diff --git a/srcpkgs/gpick/template b/srcpkgs/gpick/template
index e96b334a6d2..f5b8451279e 100644
--- a/srcpkgs/gpick/template
+++ b/srcpkgs/gpick/template
@@ -4,7 +4,8 @@ version=0.3
 revision=1
 build_style=cmake
 hostmakedepends="gettext pkg-config ragel"
-makedepends="boost-devel-minimal gtk+3-devel lua52-devel expat-devel"
+makedepends="boost-devel-minimal libboost_unit_test_framework
+ gtk+3-devel lua52-devel expat-devel"
 short_desc="Advanced color picker written in C++ using GTK+ toolkit"
 maintainer="Alexander Mamay <alexander@mamay.su>"
 license="BSD-3-Clause"