diff --git a/games-rpg/fheroes2/fheroes2-0.9.11.recipe b/games-rpg/fheroes2/fheroes2-0.9.18.recipe
similarity index 95%
rename from games-rpg/fheroes2/fheroes2-0.9.11.recipe
rename to games-rpg/fheroes2/fheroes2-0.9.18.recipe
index 726838d77..338fa94d1 100644
--- a/games-rpg/fheroes2/fheroes2-0.9.11.recipe
+++ b/games-rpg/fheroes2/fheroes2-0.9.18.recipe
@@ -3,11 +3,11 @@ DESCRIPTION="Free Heroes 2 is a turn based strategy video game.
 The original game was voted the sixth best PC game of all time by PC Gamer \
 magazine in May 1997."
 HOMEPAGE="https://github.com/ihhub/fheroes2/"
-COPYRIGHT="2006-2021 fheroes2 team"
+COPYRIGHT="2006-2022 fheroes2 team"
 LICENSE="GNU GPL v2"
 REVISION="1"
 SOURCE_URI="https://github.com/ihhub/fheroes2/archive/refs/tags/$portVersion.tar.gz"
-CHECKSUM_SHA256="afd56848083a28effcc8eb5a10983abe27f8ec8a469f470b04317e822ac27cb4"
+CHECKSUM_SHA256="bcd9afce7b869630f97cfdb713668f0f7dccf69fc6b31db1ca74ac2f63524a8d"
 SOURCE_DIR="fheroes2-$portVersion"
 srcGitRev2="4f376fe483a6881a44d2565c98a81b3c5c72daad"
 SOURCE_URI_2="https://github.com/EXL/BeGameLauncher/archive/$srcGitRev2.tar.gz"
@@ -93,7 +93,6 @@ INSTALL()
 	make install
 
 	mv $appsDir/fHeroes2/fheroes2 $appsDir/fHeroes2/fHeroes2
-	cp $sourceDir/fheroes2.key $appsDir/fHeroes2
 
 	cp $sourceDir2/build/fHeroes2Launcher $appsDir/fHeroes2/fHeroes2-Launcher
 
diff --git a/games-rpg/fheroes2/patches/fheroes2-0.9.11.patchset b/games-rpg/fheroes2/patches/fheroes2-0.9.18.patchset
similarity index 72%
rename from games-rpg/fheroes2/patches/fheroes2-0.9.11.patchset
rename to games-rpg/fheroes2/patches/fheroes2-0.9.18.patchset
index fecac4bbc..b3a52d1cb 100644
--- a/games-rpg/fheroes2/patches/fheroes2-0.9.11.patchset
+++ b/games-rpg/fheroes2/patches/fheroes2-0.9.18.patchset
@@ -1,11 +1,11 @@
-From 3ce0b2aa74df8c8e32b15d5cf66665b5555961aa Mon Sep 17 00:00:00 2001
+From 61895bf0790ae913bc151773a3d8098017b67093 Mon Sep 17 00:00:00 2001
 From: Gerasim Troeglazov <3dEyes@gmail.com>
 Date: Sun, 26 Dec 2021 11:50:09 +1000
 Subject: Fix build for Haiku
 
 
 diff --git a/src/engine/endian_h2.h b/src/engine/endian_h2.h
-index 7d1fa27..7a194c3 100644
+index 2c65f50..6c0dcdb 100644
 --- a/src/engine/endian_h2.h
 +++ b/src/engine/endian_h2.h
 @@ -21,7 +21,7 @@
@@ -18,22 +18,22 @@ index 7d1fa27..7a194c3 100644
  
  #elif defined( __FreeBSD__ ) || defined( __OpenBSD__ )
 diff --git a/src/engine/system.cpp b/src/engine/system.cpp
-index 853206c..8bc6354 100644
+index d5aff19..7f56423 100644
 --- a/src/engine/system.cpp
 +++ b/src/engine/system.cpp
-@@ -26,6 +26,11 @@
- #include <map>
- #include <memory>
+@@ -38,6 +38,11 @@
+ 
+ #include <SDL.h>
  
 +#if defined( __HAIKU__ )
 +#include <Path.h>
 +#include <FindDirectory.h>
 +#endif
 +
- #if defined( ANDROID ) || defined( _MSC_VER )
- #include <clocale>
- #endif
-@@ -138,6 +143,11 @@ std::string System::GetConfigDirectory( const std::string & prog )
+ #if defined( __MINGW32__ ) || defined( _MSC_VER )
+ #define WIN32_LEAN_AND_MEAN
+ // clang-format off
+@@ -164,6 +169,11 @@ std::string System::GetConfigDirectory( const std::string & prog )
  
      return std::string();
  #else
@@ -45,9 +45,9 @@ index 853206c..8bc6354 100644
      return GetHomeDirectory( prog );
  #endif
  }
-@@ -157,6 +167,11 @@ std::string System::GetDataDirectory( const std::string & prog )
+@@ -190,6 +200,11 @@ std::string System::GetDataDirectory( const std::string & prog )
  
-     return std::string();
+     return {};
  #else
 +#if defined( __HAIKU__ )
 +	BPath dataDir;
@@ -58,18 +58,17 @@ index 853206c..8bc6354 100644
  #endif
  }
 diff --git a/src/fheroes2/CMakeLists.txt b/src/fheroes2/CMakeLists.txt
-index 0f9b8c8..e47fcd3 100644
+index da99387..2ee3300 100644
 --- a/src/fheroes2/CMakeLists.txt
 +++ b/src/fheroes2/CMakeLists.txt
-@@ -45,4 +45,8 @@ target_link_libraries(fheroes2
+@@ -113,3 +113,7 @@ target_link_libraries(
+ 	Threads::Threads
  	ZLIB::ZLIB
  	)
- 
++
 +if(HAIKU)
 +	target_link_libraries(fheroes2 be)
 +endif(HAIKU)
-+
- install(TARGETS fheroes2 DESTINATION ${CMAKE_INSTALL_BINDIR})
 -- 
-2.30.2
+2.36.1