diff --git a/games-arcade/nxengine/additional-files/NXEngine.sh b/games-arcade/nxengine/additional-files/NXEngine.sh
index fba00eea6..eda701f2f 100644
--- a/games-arcade/nxengine/additional-files/NXEngine.sh
+++ b/games-arcade/nxengine/additional-files/NXEngine.sh
@@ -1,8 +1,8 @@
 #!/bin/bash
 if [[ `locale -l` == ru* ]] ;
 then
-    EXE="`finddir B_SYSTEM_APPS_DIRECTORY`/NXEngine/RUS/nx-rus"
+    EXE="`finddir B_SYSTEM_APPS_DIRECTORY`/NXEngine/RUS/Cave Story"
 else
-    EXE="`finddir B_SYSTEM_APPS_DIRECTORY`/NXEngine/ENG/nx"
+    EXE="`finddir B_SYSTEM_APPS_DIRECTORY`/NXEngine/ENG/Cave Story"
 fi
-$EXE $@
+"$EXE" $@
diff --git a/games-arcade/nxengine/nxengine-1.0.0.4~git.recipe b/games-arcade/nxengine/nxengine-1.0.0.4~git.recipe
index e61c4b18f..d59a10050 100644
--- a/games-arcade/nxengine/nxengine-1.0.0.4~git.recipe
+++ b/games-arcade/nxengine/nxengine-1.0.0.4~git.recipe
@@ -7,7 +7,7 @@ into the position of savior as he endeavors to defeat the Doctor."
 HOMEPAGE="http://exlmoto.ru/nxengine/"
 COPYRIGHT="2010-2016 Caitlin (rogueeve) Shaw"
 LICENSE="GNU GPL v3"
-REVISION="1"
+REVISION="2"
 srcGitRev="61642da9fec041fc0791dbb51e423f3e2e117423"
 portVersionSub="`echo $portVersion | cut -c 1-7`"
 SOURCE_URI="https://github.com/EXL/NXEngine/archive/$srcGitRev.tar.gz"
@@ -65,6 +65,16 @@ INSTALL()
 	cd build/
 	mkdir -p $appsDir/NXEngine/{ENG,RUS}
 
+	cp $portDir/additional-files/NXEngine.sh "$appsDir/NXEngine/Cave Story"
+	chmod +x "$appsDir/NXEngine/Cave Story"
+
+	cp -r $sourceDir2/* $appsDir/NXEngine/ENG
+	cp -r $sourceDir3/* $appsDir/NXEngine/RUS
+	rm -rf $appsDir/NXEngine/{ENG,RUS}/nx
+	rm -rf $appsDir/NXEngine/{ENG,RUS}/settings.dat
+	cp nx "$appsDir/NXEngine/ENG/Cave Story"
+	cp nx-rus "$appsDir/NXEngine/RUS/Cave Story"
+
 	local APP_SIGNATURE="application/x-vnd.nxengine"
 	local MAJOR="`echo "$portVersion" | cut -d. -f1`"
 	local MIDDLE="`echo "$portVersion" | cut -d. -f2`"
@@ -76,19 +86,31 @@ INSTALL()
 		-e "s|@MIDDLE@|$MIDDLE|" \
 		-e "s|@MINOR@|$MINOR|" \
 		-e "s|@LONG_INFO@|$LONG_INFO|" \
-		$portDir/additional-files/nxengine.rdef.in > $sourceDir/build/nxengine.rdef
+		$portDir/additional-files/nxengine.rdef.in > $sourceDir/build/nxengine-launcher.rdef
+	rc nxengine-launcher.rdef
+	resattr -o "$appsDir/NXEngine/Cave Story" nxengine-launcher.rsrc
 
-	cp $portDir/additional-files/NXEngine.sh $appsDir/NXEngine/NXEngine
-	chmod +x $appsDir/NXEngine/NXEngine
-	settype -t application/x-vnd.Be-elfexecutable $appsDir/NXEngine/NXEngine
-	rc nxengine.rdef
-	resattr -o $appsDir/NXEngine/NXEngine nxengine.rsrc
+	local APP_SIGNATURE="application/x-vnd.nxengine-eng"
+	sed \
+		-e "s|@APP_SIGNATURE@|$APP_SIGNATURE|" \
+		-e "s|@MAJOR@|$MAJOR|" \
+		-e "s|@MIDDLE@|$MIDDLE|" \
+		-e "s|@MINOR@|$MINOR|" \
+		-e "s|@LONG_INFO@|$LONG_INFO|" \
+		$portDir/additional-files/nxengine.rdef.in > $sourceDir/build/nxengine-eng.rdef
+	addResourcesToBinaries  $sourceDir/build/nxengine-eng.rdef \
+		"$appsDir/NXEngine/ENG/Cave Story"
 
-	cp -r $sourceDir2/* $appsDir/NXEngine/ENG
-	cp -r $sourceDir3/* $appsDir/NXEngine/RUS
-	rm -rf $appsDir/NXEngine/{ENG,RUS}/nx
-	rm -rf $appsDir/NXEngine/{ENG,RUS}/settings.dat
-	cp nx $appsDir/NXEngine/ENG/
-	cp nx-rus $appsDir/NXEngine/RUS/
-	addAppDeskbarSymlink $appsDir/NXEngine/NXEngine
+	local APP_SIGNATURE="application/x-vnd.nxengine-rus"
+	sed \
+		-e "s|@APP_SIGNATURE@|$APP_SIGNATURE|" \
+		-e "s|@MAJOR@|$MAJOR|" \
+		-e "s|@MIDDLE@|$MIDDLE|" \
+		-e "s|@MINOR@|$MINOR|" \
+		-e "s|@LONG_INFO@|$LONG_INFO|" \
+		$portDir/additional-files/nxengine.rdef.in > $sourceDir/build/nxengine-rus.rdef
+	addResourcesToBinaries  $sourceDir/build/nxengine-rus.rdef \
+		"$appsDir/NXEngine/RUS/Cave Story"
+
+	addAppDeskbarSymlink "$appsDir/NXEngine/Cave Story"
 }