diff --git a/haiku-apps/W6/W6-1.7.recipe b/haiku-apps/W6/W6-1.7.recipe
deleted file mode 100644
index 0a217b667..000000000
--- a/haiku-apps/W6/W6-1.7.recipe
+++ /dev/null
@@ -1,28 +0,0 @@
-DESCRIPTION="What Went Wrong? it's a World Wide War!"
-HOMEPAGE="http://lema.link-u.com/be/"
-SRC_URI="http://lema.link-u.com/be/W6Haiku.zip"
-CHECKSUM_MD5="763e608d79ee6de6efe6dcb77600a331"
-REVISION="1"
-STATUS_HAIKU="stable"
-DEPEND=""
-
-BUILD()
-{
-	cd W6Haiku
-	make
-	cd ../
-	wget http://lema.link-u.com/be/W6forR5-with-sources.zip
-	unzip W6forR5-with-sources.zip
-	cp -r W6/w6s W6Haiku
-}
-
-INSTALL()
-{
-	cd W6Haiku
-	mkdir -p $DESTDIR`finddir B_APPS_DIRECTORY`/W6
-	install -m 0755 objects.x86-gcc`setgcc | tail -c -2`-release/W6Haiku $DESTDIR`finddir B_APPS_DIRECTORY`/W6/W6
-	cp -r w6s $DESTDIR`finddir B_APPS_DIRECTORY`/W6
-}
-
-LICENSE="Public Domain"
-COPYRIGHT="1998-1999 Santiago Lema"
diff --git a/haiku-apps/W6/patches/w6-1.7.patch b/haiku-games/w6/patches/w6-1.7.patch
similarity index 52%
rename from haiku-apps/W6/patches/w6-1.7.patch
rename to haiku-games/w6/patches/w6-1.7.patch
index a99e78ed2..25a6f228a 100644
--- a/haiku-apps/W6/patches/w6-1.7.patch
+++ b/haiku-games/w6/patches/w6-1.7.patch
@@ -28,7 +28,26 @@ diff -Naur W6Haiku/W6.cpp W6Haiku-haiku/W6.cpp
 +	//run_me = new Running(_country,_group,_politic,_weapon,_jour);
  	runWin = new BWindow(BRect(0,0,0,0), "W6 time run", B_TITLED_WINDOW,  B_NOT_RESIZABLE); 
 -	runWin->AddChild(run_me); //sinon le pulse fonctionne pas...					  
-+	//runWin->AddChild(run_me); //sinon le pulse fonctionne pas...					  
++	//runWin->AddChild(run_me); //sinon le pulse fonctionne pas...
  	runWin->Lock();  
  	runWin->Show(); //faut faire show pour lancer le pulse dans les views
  	runWin->Hide(); //quitte à hider la window ensuite
+diff -Naur W6Haiku/makefile W6Haiku/makefil
+e-new
+--- W6Haiku/makefile    2014-01-09 17:29:39.128974848 +0100
++++ W6Haiku/makefile-new        2014-01-09 17:31:10.101974016 +0100
+@@ -3,9 +3,12 @@
+ NAME := W6Haiku
+ TYPE := APP
+ SRCS := BarView.cpp BubbleHelper.cpp BuyWindow.cpp ChooseView.cpp ChooseWindow.cpp ColGrpView.cpp ColorWindow.cpp EditGrpWindow.cpp EditPolWindow.cpp EditWindow.cpp EditorGrpView.cpp EditorPolView.cpp EditorView.cpp FlagView.cpp GroupView.cpp GroupWindow.cpp HistoryView.cpp InfoView.cpp InfoWindow.cpp Init.cpp MapView.cpp OrderWindow.cpp PowerView.cpp Running.cpp SendWindow.cpp SpeedWindow.cpp StatusView.cpp TopView.cpp TxtView.cpp W6.cpp W6Window.cpp WeatherView.cpp attack.cpp classSound.cpp classSoundMaster.cpp country.cpp day.cpp group.cpp politic.cpp weapon.cpp 
+-LIBS := be media png tracker root translation
++LIBS := be media tracker root translation
+ OPTIMIZE := FULL
+ RSRCS := img.rsrc w6.rsrc 
+ CC=g++#Additional makerules go here, use '#' to comment out lines
+ 
+-include /boot/develop/etc/makefile-engine
++## include the makefile-engine
++DEVEL_DIRECTORY := \
++       $(shell findpaths -r "makefile_engine" B_FIND_PATH_DEVELOP_DIRECTORY)
++include $(DEVEL_DIRECTORY)/etc/makefile-engine
diff --git a/haiku-games/w6/w6-1.7.recipe b/haiku-games/w6/w6-1.7.recipe
new file mode 100644
index 000000000..0149754d3
--- /dev/null
+++ b/haiku-games/w6/w6-1.7.recipe
@@ -0,0 +1,56 @@
+SUMMARY="A strategy game simulating a world wide war"
+DESCRIPTION="\"What Went Wrong? it's a World Wide War!\" features a worldmap \
+with every single country on this planet including Swaziland (great hello to \
+all of you Swaziland BeOS users). It has real data for every country in the \
+world (at least in the 70's), including population, PNB etc.
+Using the editor, you can let the computer play alone and turn it in kind of \
+war simulation software.
+"
+HOMEPAGE="http://lema.link-u.com/be/"
+SRC_URI="http://lema.link-u.com/be/W6Haiku.zip"
+CHECKSUM_MD5="763e608d79ee6de6efe6dcb77600a331"
+SRC_URI_2="http://lema.link-u.com/be/W6forR5-with-sources.zip"
+CHECKSUM_MD5_2="4974a2ee05c68de6c5f7817d6be3bf97"
+REVISION="1"
+LICENSE="Public Domain"
+COPYRIGHT="1998-1999 Santiago Lema"
+
+ARCHITECTURES="x86_gcc2 ?x86 ?x86_64"
+
+PROVIDES="
+	w6 = $portVersion
+	app:w6 = $portVersion
+	"
+REQUIRES="
+	haiku >= $haikuVersion
+	"
+BUILD_REQUIRES="
+	haiku_devel >= $haikuVersion
+	"
+BUILD_PREREQUIRES="
+	makefile_engine
+	cmd:make
+	cmd:gcc
+	"
+
+SOURCE_DIR="W6Haiku"
+SOURCE_DIR_2="W6"
+
+PATCHES="w6-1.7.patch"
+
+BUILD()
+{
+	make $jobArgs
+}
+
+INSTALL()
+{
+	ARCHITECTURE=$(echo $buildArchitecture | sed 's/_/-/g')
+	
+	APPDIR=$appsDir/W6
+	mkdir -p $APPDIR
+	cp -a objects.$ARCHITECTURE-release/W6Haiku $APPDIR/W6
+	cp -r $sourceDir2/w6s $APPDIR
+	cp -r $sourceDir2/help $APPDIR
+	addAppDeskbarSymlink $APPDIR/W6
+}