diff --git a/games-arcade/goonies/goonies-1.4.1528.recipe b/games-arcade/goonies/goonies-1.4.1528.recipe
index e14ae2f99..f4552b867 100644
--- a/games-arcade/goonies/goonies-1.4.1528.recipe
+++ b/games-arcade/goonies/goonies-1.4.1528.recipe
@@ -1,9 +1,8 @@
 SUMMARY="Find treasure and escape back to save the Goon Docks from demolition"
-DESCRIPTION="
-The action takes place in the sleepy seaside town of Cauldron Point - down in \
-an area known as the Goon Docks. The Goonies are a group of local kids - Mikey, \
-Brand, Mouth, Chunk and Data. One day they find an old treasure map in Mikey's \
-attic.
+DESCRIPTION="The action takes place in the sleepy seaside town of Cauldron \
+Point - down in an area known as the Goon Docks. The Goonies are a group of \
+local kids - Mikey, Brand, Mouth, Chunk and Data. One day they find an old \
+treasure map in Mikey's attic.
 Data figures that this must be the fabulous hidden treasure of the \
 notorious local pirate, One-Eyed Willy.
 The girls, Andy and Stef, join the other Goonies and the adventure begins. But \
@@ -12,14 +11,13 @@ the Fratelli Gang, and the Goonies are soon trapped! The Goonies have a \
 powerful ally on their side, however, in the form of the huge and amiable Sloth.
 
 When you play this game, you are Sloth! Can you help the Goonies find the \
-treasure and escape back to save the Goon Docks from demolition?
-"
+treasure and escape back to save the Goon Docks from demolition?"
 HOMEPAGE="http://www2.braingames.getput.com/goonies/"
 LICENSE="GNU GPL v2"
 COPYRIGHT="2006-2009 Brain Games"
 SOURCE_URI="http://braingames.jorito.net/goonies/downloads/goonies.src_1.4.1528.tgz"
 CHECKSUM_SHA256="9e9c1e67a41dfae512e975b6931828cdc82f07397921ca0a41a81c3020a73799"
-REVISION="2"
+REVISION="3"
 ARCHITECTURES="!x86_gcc2 x86"
 SECONDARY_ARCHITECTURES="x86"
 
@@ -61,12 +59,13 @@ BUILD()
 
 INSTALL()
 {
-	installDir=$appsDir/"Goonies"
-	mkdir -p "$installDir"
-	make install PREFIX="$installDir" GAMEDIR="$installDir"
 
-#	cd "$installDir"
-#	echo -e "#!/bin/sh\n`cat roadfighter`" > roadfighter
+	make install PREFIX=$appsDir/Goonies GAMEDIR=$appsDir/Goonies
 
-	addAppDeskbarSymlink "$installDir/goonies" "Goonies"
+	rm $appsDir/Goonies/goonies
+	mv $appsDir/Goonies/share/games/goonies/* $appsDir/Goonies
+	mv $appsDir/Goonies/goonies $appsDir/Goonies/Goonies
+	rm -rf $appsDir/Goonies/share
+
+	addAppDeskbarSymlink $appsDir/Goonies/Goonies
 }
diff --git a/games-arcade/goonies/patches/goonies-1.4.1528.patchset b/games-arcade/goonies/patches/goonies-1.4.1528.patchset
index 0f2c72ec9..4669dd665 100644
--- a/games-arcade/goonies/patches/goonies-1.4.1528.patchset
+++ b/games-arcade/goonies/patches/goonies-1.4.1528.patchset
@@ -1,4 +1,4 @@
-From 0945ad6ec688efbc88d8adfb3a546085819b8d30 Mon Sep 17 00:00:00 2001
+From 1308538911e063913c3ec91962ff89cd80a732af Mon Sep 17 00:00:00 2001
 From: Adrien Destugues <pulkomandy@pulkomandy.tk>
 Date: Tue, 28 Jan 2014 22:43:44 +0100
 Subject: Use the right compiler.
@@ -18,5 +18,37 @@ index df4bb3d..3ccca0c 100644
  LDFLAGS = `sdl-config --libs` -L/usr/X11R6/lib/ -lSDL_image -lSDL_mixer -lGL -lGLU
  RM = rm -f
 -- 
-1.8.3.4
+2.7.0
+
+
+From 724f286a201653c8594a9af2e9496c0d4456ceff Mon Sep 17 00:00:00 2001
+From: Sergei Reznikov <diver@gelios.net>
+Date: Sat, 23 Jan 2016 13:22:49 +0300
+Subject: main directory fix
+
+
+diff --git a/src/main.cpp b/src/main.cpp
+index fb8fa0a..9e8a7c0 100644
+--- a/src/main.cpp
++++ b/src/main.cpp
+@@ -8,6 +8,8 @@
+ 
+ #include <stdio.h>
+ #include <stdlib.h>
++#include <unistd.h>
++#include <libgen.h>
+ #include "math.h"
+ #include "string.h"
+ #include "time.h"
+@@ -233,7 +235,7 @@ int main(int argc, char** argv) {
+ 
+     TheGooniesApp *game;
+     KEYBOARDSTATE *k;
+-
++	chdir(dirname(argv[0]));
+     // hmm... apparently we didn't seed earlier... weird...
+     srand(time(0));
+ 
+-- 
+2.7.0