diff --git a/games-engines/solarus/solarus-1.5.1.recipe b/games-engines/solarus/solarus-1.5.1.recipe
index a6f806daa..0cc8dea1e 100644
--- a/games-engines/solarus/solarus-1.5.1.recipe
+++ b/games-engines/solarus/solarus-1.5.1.recipe
@@ -4,17 +4,19 @@ Solarus is an open-source Zelda-like 2D game engine."
 HOMEPAGE="http://solarus-games.org"
 COPYRIGHT="2006-2017 Christopho, Solarus"
 LICENSE="GNU GPL v3"
-REVISION="2"
+REVISION="3"
 SOURCE_URI="http://www.solarus-games.org/downloads/solarus/solarus-${portVersion}-src.tar.gz"
 CHECKSUM_SHA256="6cd3928a024f7c18a163a1679a92dfff3c37139c5c49fa5348704df5357e8da3"
 
-ARCHITECTURES="x86_gcc2 x86 x86_64"
+ARCHITECTURES="!x86_gcc2 x86 x86_64"
 SECONDARY_ARCHITECTURES="x86"
 
 PROVIDES="
 	solarus$secondaryArchSuffix = $portVersion
+	cmd:solarus = $portVersion
 	cmd:solarus_run = $portVersion
 	lib:libsolarus$secondaryArchSuffix
+	lib:libsolarus_gui$secondaryArchSuffix
 	"
 REQUIRES="
 	haiku$secondaryArchSuffix
@@ -27,6 +29,9 @@ REQUIRES="
 	lib:libluajit_5.1$secondaryArchSuffix
 	lib:libopenal$secondaryArchSuffix
 	lib:libogg$secondaryArchSuffix
+	lib:libQt5Core$secondaryArchSuffix
+	lib:libQt5Gui$secondaryArchSuffix
+	lib:libQt5Widgets$secondaryArchSuffix
 	"
 
 BUILD_REQUIRES="
@@ -40,6 +45,9 @@ BUILD_REQUIRES="
 	devel:libluajit_5.1$secondaryArchSuffix
 	devel:libopenal$secondaryArchSuffix
 	devel:libogg$secondaryArchSuffix
+	devel:libQt5Core$secondaryArchSuffix
+	devel:libQt5Gui$secondaryArchSuffix
+	devel:libQt5Widgets$secondaryArchSuffix
 	"
 BUILD_PREREQUIRES="
 	cmd:cmake
@@ -52,7 +60,7 @@ BUILD_PREREQUIRES="
 BUILD()
 {
 	cmake -DCMAKE_INSTALL_PREFIX="$prefix" \
-		-DCMAKE_BUILD_TYPE=Release -DSOLARUS_GUI=off .
+		-DCMAKE_BUILD_TYPE=Release .
 	make $jobArgs
 }
 
@@ -60,7 +68,6 @@ INSTALL()
 {
 	make install
 
-	mkdir -p $includeDir
-	mv $prefix/include/* $includeDir/
-	rm -rf $prefix/include
+	mkdir -p $(dirname $includeDir)
+	mv $prefix/include $includeDir
 }