diff --git a/emulators/emulationstation/Makefile b/emulators/emulationstation/Makefile
index d024b84f9aa..981ddd6493c 100644
--- a/emulators/emulationstation/Makefile
+++ b/emulators/emulationstation/Makefile
@@ -14,10 +14,10 @@ HOMEPAGE =		http://www.emulationstation.org/
 # MIT
 PERMIT_PACKAGE =	Yes
 
-WANTLIB += GL GLU SDL2 boost_date_time-mt boost_filesystem-mt
-WANTLIB += boost_atomic-mt boost_chrono-mt boost_thread-mt
-WANTLIB += boost_locale-mt c curl freeimage freetype
-WANTLIB += m pthread ${COMPILER_LIBCXX}
+WANTLIB += ${COMPILER_LIBCXX} GL GLU SDL2 boost_atomic-mt boost_charconv-mt
+WANTLIB += boost_chrono-mt boost_container-mt boost_date_time-mt
+WANTLIB += boost_filesystem-mt boost_locale-mt boost_thread-mt
+WANTLIB += c curl freeimage freetype m
 
 MODULES =		devel/cmake
 
diff --git a/emulators/emulationstation/patches/patch-CMakeLists_txt b/emulators/emulationstation/patches/patch-CMakeLists_txt
new file mode 100644
index 00000000000..99b1c726f32
--- /dev/null
+++ b/emulators/emulationstation/patches/patch-CMakeLists_txt
@@ -0,0 +1,12 @@
+Index: CMakeLists.txt
+--- CMakeLists.txt.orig
++++ CMakeLists.txt
+@@ -45,7 +45,7 @@ endif()
+ find_package(Freetype REQUIRED)
+ find_package(FreeImage REQUIRED)
+ find_package(SDL2 REQUIRED)
+-find_package(Boost REQUIRED COMPONENTS system filesystem date_time locale)
++find_package(Boost REQUIRED COMPONENTS filesystem date_time locale)
+ find_package(Eigen3 REQUIRED)
+ find_package(CURL REQUIRED)
+