diff --git a/games-engines/solarus/additional-files/solarus.rdef.in b/games-engines/solarus/additional-files/solarus.rdef.in
new file mode 100644
index 000000000..20a2d4dd8
--- /dev/null
+++ b/games-engines/solarus/additional-files/solarus.rdef.in
@@ -0,0 +1,82 @@
+
+resource app_flags B_SINGLE_LAUNCH;
+
+resource app_version {
+	major  = @MAJOR@,
+	middle = @MIDDLE@,
+	minor  = @MINOR@,
+
+	variety = B_APPV_FINAL,
+	internal = 0,
+
+	short_info = "@APP_NAME@",
+	long_info = "@LONG_INFO@"
+};
+
+resource app_signature "@APP_SIGNATURE@";
+
+resource vector_icon {
+	$"6E6369660303ED831203FABA0D05FF100609FFFF013435343534BB1A343334BA"
+	$"D534BA593332BACA32B9E8322E32B93E32B78432B590BB09B663BA7DB53DBB41"
+	$"2736B566362B3633362F36BACA36343534BB963435350609FFFF014C354C354C"
+	$"BB1A4C334CBAD54CBA594D32C4B532C598325232C64132C7FB32C9EFBB09C91D"
+	$"BA7DCA42BB415936CA193655364D365136C4B5364C354CBB964C35350214CBF6"
+	$"40CBF640CB6CBD775236C95F36C6C136C66CBBCAC696BBC6C66CBBC8C66C36C6"
+	$"6CBBC6C433364036C1F936BD8636B91336BB4D36B913BBC6B913BBCAB913BBC8"
+	$"B8E9BBC62E36B8BE36B62036B38940B414BD77B37D402140B371402141214321"
+	$"4221C3CE2E50B5B750BA0C50BC504CBB5FC582BD754C404CBE9A4CC0E54CC32F"
+	$"4CC20A4CC420C5825250C57350C9C8505F435FC3CE5F425F405F41CC0E40CBF6"
+	$"40CC0240CBF640CBF640CBF640CBF640020C523352334C33403346333A332E33"
+	$"3433B5B733214021BCE321C29C2E4DB5B74DBA0C4DBC5049BB5FC450BD754940"
+	$"49BE9A49C0E549C32F49C20A49C420C450524DC5734DC9C84D5F405FC29C5FBC"
+	$"E35233C9C83352335233523352330216323E323E313E2F3E303E2F3D2F3B2F3C"
+	$"2FBD892E3AB8CC3AB8723A2D3AB84F3AB7F53A2C3B2CBD892C3C2C3E2C3D2B3E"
+	$"293E2A3EB65D3E283F28BF2128BF7C284028BF9D28BFF82941B65D412A412C41"
+	$"2B412C422C442C432CC1902D45B7F545B84F452E45B87245B8CC452F442FC190"
+	$"2F432F412F42304132413141BA6441334033BFF833BF9D333F33BF7C33BF2132"
+	$"3EBA643E323E323E323E323E0216323D323D313D2F3D303D2F3C2F3A2F3B2FBD"
+	$"232E39B8CC39B872392D39B84F39B7F5392C3A2CBD232C3B2C3D2C3C2B3D293D"
+	$"2A3DB65D3D283E28BEBB28BF16283F28BF3728BF922940B65D402A402C402B40"
+	$"2C412C432C422CC12A2D44B7F544B84F442E44B87244B8CC442F432FC12A2F42"
+	$"2F402F41304032403140BA6440333F33BF9233BF37333E33BF1633BEBB323DBA"
+	$"643D323D323D323D323D0606FF074F404F404FC0304D42C55E42C47D424B404B"
+	$"C0304BBF4F4D3EC47D3EC55E3E4F404FBF4F4F40400606FF074F3F4F3F4FBFCA"
+	$"4D41C55E41C47D414B3F4BBFCA4BBEE94D3DC47D3DC55E3D4F3F4FBEE94F3F3F"
+	$"0606FF07543C543C54BE98523EC75C3EC67B3E503C50BE9850BDB7523AC67B3A"
+	$"C75C3A543C54BDB7543C3C0606FF07543B543B54BE32523DC75C3DC67B3D503B"
+	$"50BE3250BD515239C67B39C75C39543B54BD51543B3B0606FF075444544454C1"
+	$"C85246C75C46C67B46504450C1C850C0E75242C67B42C75C42544454C0E75444"
+	$"440606FF075443544354C1625245C75C45C67B45504350C16250C0815241C67B"
+	$"41C75C41544354C0815443430606FF075940594059C0305742C95A42C8794255"
+	$"4055C03055BF4F573EC8793EC95A3E594059BF4F5940400606FF07593F593F59"
+	$"BFCA5741C95A41C87941553F55BFCA55BEE9573DC8793DC95A3D593F59BEE959"
+	$"3F3F022BBFB637BFB637BDD437BC4CBF93BC4CBDB0BC4CC038BCCC44BC7BC0D3"
+	$"BCDC44BCFE44BCED44BDA8C0ADBF95BEC1BF2CBF2ABFD2BEFDC03DBE91C024BE"
+	$"ABC03DBE61C03DBE02C03DBE31C047BE08C05BBE18C051BE0FC081BE3FC0ABBE"
+	$"69C09ABE57C0DCBE38C13EBDD6C10DBE07C13EBDBDC13EBD8AC13EBDA4C143BD"
+	$"7C44BD64C14BBD6FC182BD39C1F2BD64C1C7BD39C21CBD8FC1F2BDFEC21CBDD3"
+	$"C1D3BE1CC180BE17C1A6BE24C171BE26C153BE44C162BE35C131BE44C0EDBE44"
+	$"C10FBE44C0EDBE66C0EDBEAAC0EDBE88C0FEBEBAC13DBEFAC117BED4C1A8BF65"
+	$"C14EC02AC14EC02AC124BFFFC0D0BFABC0FABFD5C0D0BFABC102BF6CC0FFBF91"
+	$"C102BF6CC102BF6CC102BF6CC102BF6CC102BF6BC102BF6BC102BF6AC102BF68"
+	$"C102BF69C102BF46C102BF04C102BF25C0E3BF04C0A6BF04C0C5BF04C0A6BF10"
+	$"C0A6BF29C0A6BF1CC099BF29C07FBF2942BF29C07FBF4AC07FBF8EC07FBF6CC0"
+	$"7FBF8EC07FBF8FC07FBF8FC07FBF9AC07FBFB0C07FBFA5C083BFB0C089BFB0C0"
+	$"86BFB042BFB5C095BFBEC091BFBAC060BFF4BF62C0F0BFE5C06EBF3DC0F03EC0"
+	$"F0BF18C0F03EC1123EC1563EC134BEF6C156BEFCC156BEF9C156BF4EC156BFF3"
+	$"C156BFA0C156C0D7C156C2A1C156C1BCC156C2F2C0D2C320BF92C320C038C320"
+	$"BDB0BFB637C19937BFB637BFB637BFB637BFB637021CBFB636BFB636BDD436BC"
+	$"4CBF2DBC4CBD4ABC4CBFD2BCCC43BC7BC06DBCDC43BCFE43BCED43BDA8C047BF"
+	$"95BE5BBF2CBEC4BFD2BE97C03DBE2BC024BE45C030BE1DC013BE01C021BE0FBF"
+	$"D9BDC8BFA8BE1FBFA8BE1FBF7EBDF5BF2ABDA1BF54BDCBBF2ABDA1C05ABDB2BF"
+	$"EEBD47C080BDD9C0AABE03C099BDF1C0DBBDD2C13DBD70C10CBDA1C12FBD49C1"
+	$"56BCFEC137BD1CC181BCD3C1F1BCFEC1C6BCD3C21BBD29C1F1BD98C21BBD6DC1"
+	$"D2BDB6C17FBDB1C1A5BDBEC14EBDE2C0ECBE44C11DBE13C0FDBE54C13CBE94C1"
+	$"16BE6EC1A7BEFFC14DBFC4C14DBFC4C123BF99C0CFBF45C0F9BF6FC0CFBF45C0"
+	$"EDBEDAC127BF13C0DFBECCC0C4BEB0C0D1BEBDC0A9BEC9C094BF58C057BF1BC0"
+	$"51BF9BBEFBC0F0BFA0C04CC032C0F0C2A0C0F0C169C0F048C06CC31FBF2CC31F"
+	$"BFD2C320BD4ABFB636C19936BFB636BFB636BFB636BFB636100A000100000A00"
+	$"0101000A000102000A010103000A000104000A020105000A000106000A020107"
+	$"000A000108000A020109000A00010A000A02010B000A00010C000A02010D000A"
+	$"00010E000A02010F00"
+};
diff --git a/games-engines/solarus/solarus-1.6.4.recipe b/games-engines/solarus/solarus-1.6.5.recipe
similarity index 57%
rename from games-engines/solarus/solarus-1.6.4.recipe
rename to games-engines/solarus/solarus-1.6.5.recipe
index 27235e1e3..b90cf8f36 100644
--- a/games-engines/solarus/solarus-1.6.4.recipe
+++ b/games-engines/solarus/solarus-1.6.5.recipe
@@ -6,24 +6,28 @@ DESCRIPTION="A lightweight, free and open-source game engine for Action-RPGs
 * Available on multiple platforms.
 * Completely free and open-source, under GPL v3 License."
 HOMEPAGE="http://solarus-games.org"
-COPYRIGHT="2006-2019 Christopho, Solarus"
+COPYRIGHT="2006-2021 Christopho and the Solarus team"
 LICENSE="GNU GPL v3"
 REVISION="1"
 SOURCE_URI="https://gitlab.com/solarus-games/solarus/-/archive/v$portVersion/solarus-v$portVersion.tar.gz"
-CHECKSUM_SHA256="dbcd74605e4101a9df310159389e6a2db89bf654e6ee24943b3c05f3ab0b13fd"
+CHECKSUM_SHA256="88a434757e711529aa672f865fe9bc8c268bce0408dc4c31db4312c2250df20b"
 SOURCE_DIR="solarus-v$portVersion"
+ADDITIONAL_FILES="solarus.rdef.in"
 
 ARCHITECTURES="all !x86_gcc2"
 SECONDARY_ARCHITECTURES="x86"
 
+libVersion="$portVersion"
+libVersionCompat="$libVersion compat >= ${libVersion%%.*}"
+
 PROVIDES="
 	solarus$secondaryArchSuffix = $portVersion
 	app:Solarus
 	cmd:solarus = $portVersion
 	cmd:solarus_launcher = $portVersion
 	cmd:solarus_run = $portVersion
-	lib:libsolarus$secondaryArchSuffix
-	lib:libsolarus_gui$secondaryArchSuffix
+	lib:libsolarus$secondaryArchSuffix = $libVersionCompat
+	lib:libsolarus_gui$secondaryArchSuffix = $libVersionCompat
 	"
 REQUIRES="
 	haiku$secondaryArchSuffix
@@ -42,6 +46,15 @@ REQUIRES="
 	lib:libvorbis$secondaryArchSuffix
 	"
 
+PROVIDES_devel="
+	solarus${secondaryArchSuffix}_devel = $portVersion
+	devel:libsolarus$secondaryArchSuffix = $libVersionCompat
+	devel:libsolarus_gui$secondaryArchSuffix = $libVersionCompat
+	"
+REQUIRES_devel="
+	solarus$secondaryArchSuffix == $portVersion base
+	"
+
 BUILD_REQUIRES="
 	haiku${secondaryArchSuffix}_devel
 	devel:glm
@@ -69,19 +82,47 @@ BUILD_PREREQUIRES="
 
 BUILD()
 {
-	cmake -DCMAKE_BUILD_TYPE=Release \
+	cmake -Bbuild -S. -DCMAKE_BUILD_TYPE=Release \
 		-DCMAKE_INSTALL_PREFIX="$prefix" \
+		-DSOLARUS_GUI_SHARE_INSTALL_DESTINATION=$dataDir/Qt5 \
 		-DSOLARUS_HEADERS_INSTALL_DESTINATION=$includeDir \
 		-DSOLARUS_LIBRARY_INSTALL_DESTINATION=$libDir \
 		-DSOLARUS_MANUAL_INSTALL_DESTINATION=$manDir \
-		-DSOLARUS_WRITE_DIR=$settingsDir . -L
-	make $jobArgs
+		-DSOLARUS_SHARE_INSTALL_DESTINATION=$dataDir \
+		-DSOLARUS_WRITE_DIR=$settingsDir \
+		-DSOLARUS_TESTS=OFF
+	make -C build $jobArgs
 }
 
 INSTALL()
 {
-	make install
+	make -C build install
+
+	prepareInstalledDevelLibs libsolarus \
+		libsolarus-gui
+
+	packageEntries devel \
+		$developDir
+
+	# we are not linux
+	rm -rf $dataDir/{applications,icons,metainfo,pixmaps}
+
+	local MAJOR="`echo "$portVersion" | cut -d. -f1`"
+	local MIDDLE="`echo "$portVersion" | cut -d. -f2`"
+	local MINOR="`echo "$portVersion" | cut -d. -f3`"
+	local APP_NAME="Solarus"
+	local LONG_INFO="$SUMMARY"
+	local APP_SIGNATURE="application/x-vnd.solarus"
+	sed \
+		-e "s|@MAJOR@|$MAJOR|" \
+		-e "s|@MIDDLE@|$MIDDLE|" \
+		-e "s|@MINOR@|$MINOR|" \
+		-e "s|@LONG_INFO@|$LONG_INFO|" \
+		-e "s|@APP_NAME@|$APP_NAME|" \
+		-e "s|@APP_SIGNATURE@|$APP_SIGNATURE|" \
+		$portDir/additional-files/solarus.rdef.in > solarus.rdef
+
+	addResourcesToBinaries solarus.rdef $prefix/bin/solarus-launcher
 
-	rm -rf $prefix/share
 	addAppDeskbarSymlink $prefix/bin/solarus-launcher Solarus
 }