diff --git a/games-puzzle/flobopuyo/flobopuyo-0.20.recipe b/games-puzzle/flobopuyo/flobopuyo-0.20.recipe
index a4b018125..42b95cce8 100644
--- a/games-puzzle/flobopuyo/flobopuyo-0.20.recipe
+++ b/games-puzzle/flobopuyo/flobopuyo-0.20.recipe
@@ -1,19 +1,47 @@
-DESCRIPTION="flobopuyo" 
-HOMEPAGE="http://www.ios-software.com/?page=projet&quoi=29&lg=AN" 
-SRC_URI="http://www.ios-software.com/download.php3?what=20151&lg=AN"
-CHECKSUM_MD5="88961898c9dd48b60464f6f10f695b8b"
+SUMMARY="Form groups of four puyos of the same color"
+DESCRIPTION="If you don't believe in Tetris games anymore, FloboPuyo will make \
+you change your mind. Its funny puyos and legendary opponents know how to heat \
+the game every time. Don't forget to develop your skills in secret before \
+challenging your friends with the multi-player mode."
+HOMEPAGE="http://www.ios-software.com/flobopuyo-en"
+SRC_URI="http://archive.ubuntu.com/ubuntu/pool/universe/f/flobopuyo/flobopuyo_0.20.orig.tar.gz"
+CHECKSUM_SHA256="bcad1be163b597b71d7dec33891e96fae85a0c09ecba6b7e70707d30af1eceb2"
+SOURCE_DIR="flobopuyo-0.20.orig"
+PATCHES="flobopuyo-$portVersion.patchset"
+
+COPYRIGHT="2015 Fovea"
+LICENSE="GNU GPL v2"
 REVISION="1"
-STATUS_HAIKU="stable"
-DEPEND="media-lib/libsdl >= 1.2.14
-	media-lib/sdl-mixer >= 1.2.11"
+
+ARCHITECTURES="x86_gcc2"
+
+PROVIDES="
+	flobopuyo = $portVersion
+"
+
+BUILD_REQUIRES="
+	haiku_devel
+	devel:sdl_image
+	devel:sdl_mixer
+"
+
+BUILD_PREREQUIRES="
+	cmd:bison
+	cmd:dos2unix
+	cmd:flex
+	cmd:gcc
+	cmd:make
+	cmd:sdl_config
+"
+
 BUILD()
 {
-	cd flubopuyo-0.2.0
-	make
+	dos2unix SDL_prim.h scenar.y
+	make $jobArgs PREFIX=$prefix/apps/flobopuyo DATADIR='$(PREFIX)/data' INSTALL_BINDIR='$(PREFIX)' INSTALL_DATADIR='$(DATADIR)'
 }
 
 INSTALL()
 {
-	cd  flubopuyo-0.2.0
-	make install
+	make install PREFIX=$prefix/apps/flobopuyo DATADIR='$(PREFIX)/data' INSTALL_BINDIR='$(PREFIX)' INSTALL_DATADIR='$(DATADIR)'
+	addAppDeskbarSymlink $prefix/apps/flobopuyo/flobopuyo Flobopuyo
 }
diff --git a/games-puzzle/flobopuyo/patches/flobopuyo-0.20.patch b/games-puzzle/flobopuyo/patches/flobopuyo-0.20.patch
deleted file mode 100644
index dbae28f6c..000000000
--- a/games-puzzle/flobopuyo/patches/flobopuyo-0.20.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Naur flobopuyo-0.20/Makefile flobopuyo-0.20-haiku/Makefile
---- flobopuyo-0.20/Makefile	2004-10-08 22:41:12.000000000 +0000
-+++ flobopuyo-0.20-haiku/Makefile	2009-11-01 19:26:32.000000000 +0000
-@@ -12,7 +12,7 @@
- DEBUG_MODE=false
- 
- # Unix/Linux settings
--PREFIX=/usr/local
-+PREFIX=/boot/common
- DATADIR=$(PREFIX)/share/games/flobopuyo
- INSTALL_BINDIR=$(DESTDIR)/$(PREFIX)/games
- INSTALL_DATADIR=$(DESTDIR)/$(DATADIR)
diff --git a/games-puzzle/flobopuyo/patches/flobopuyo-0.20.patchset b/games-puzzle/flobopuyo/patches/flobopuyo-0.20.patchset
new file mode 100644
index 000000000..24bb5459f
--- /dev/null
+++ b/games-puzzle/flobopuyo/patches/flobopuyo-0.20.patchset
@@ -0,0 +1,71 @@
+From a5bb4f4ace0edeafe26cf92b3f24e07a1ac75d7f Mon Sep 17 00:00:00 2001
+From: Adrien Destugues <pulkomandy@gmail.com>
+Date: Fri, 20 Feb 2015 08:59:44 +0100
+Subject: Make gcc2 happy.
+
+
+diff --git a/PuyoStarter.cpp b/PuyoStarter.cpp
+index d51eb61..4d3553f 100644
+--- a/PuyoStarter.cpp
++++ b/PuyoStarter.cpp
+@@ -604,6 +604,7 @@ void PuyoStarter::run(int _score1, int _score2, int lives, int point1, int point
+                         }
+                         break;
+                       case SDL_KEYDOWN:
++						{
+                         /* check for cheat-codes */
+                         static int cheatcode = 0;
+                         if (event.key.keysym.sym == SDLK_k) cheatcode  = 0;
+@@ -617,6 +618,7 @@ void PuyoStarter::run(int _score1, int _score2, int lives, int point1, int point
+                           attachedGameA->dropNeutrals();
+                           attachedGameA->increaseNeutralPuyos(PUYODIMX * 12);
+                         }
++						}
+                       default:
+                         break;
+                     }
+-- 
+2.2.2
+
+
+From 1b0eccc61ce85dddd693a763f560756fb100f89d Mon Sep 17 00:00:00 2001
+From: Adrien Destugues <pulkomandy@gmail.com>
+Date: Fri, 20 Feb 2015 09:41:48 +0100
+Subject: Move settings to the right place.
+
+
+diff --git a/preferences.c b/preferences.c
+index 7f2cbdd..1b7d957 100644
+--- a/preferences.c
++++ b/preferences.c
+@@ -145,6 +145,10 @@ void GetStrPreference (const char *name, char *out, const char *defaut, const in
+ #include <sys/types.h>
+ #include <sys/stat.h>
+ 
++#ifdef __HAIKU__
++#include <FindDirectory.h>
++#endif
++
+ static const char * prefsfile = ".flobopuyorc";
+ static const char * sep = "\n\r";
+ 
+@@ -158,10 +162,13 @@ static void fetchFile(void)
+     
+     if (home == NULL)
+     {
+-#ifndef _WIN32
+-        char * h = getenv("HOME");
+-#else
++#ifdef __HAIKU__
++		char h[256];
++		find_directory(B_USER_SETTINGS_DIRECTORY, 0, false, h, 256);
++#elif defined _WIN32
+         char * h = ".";
++#else
++        char * h = getenv("HOME");
+ #endif
+         if (h==NULL) return;
+         home = (char *)malloc(strlen(h)+strlen(prefsfile)+2);
+-- 
+2.2.2
+