diff --git a/haiku-apps/W6/W6-1.7.bep b/haiku-apps/W6/W6-1.7.bep
new file mode 100644
index 000000000..70d7588e6
--- /dev/null
+++ b/haiku-apps/W6/W6-1.7.bep
@@ -0,0 +1,26 @@
+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-apps/W6/patches/w6-1.7.patch
new file mode 100644
index 000000000..a99e78ed2
--- /dev/null
+++ b/haiku-apps/W6/patches/w6-1.7.patch
@@ -0,0 +1,34 @@
+diff -Naur W6Haiku/InfoView.cpp W6Haiku-haiku/InfoView.cpp
+--- W6Haiku/InfoView.cpp	2008-08-16 02:57:03.065798144 +0000
++++ W6Haiku-haiku/InfoView.cpp	2013-01-13 11:59:46.657457152 +0000
+@@ -280,7 +280,7 @@
+ 	sprintf(str2,_jour->month_name);  	strcat(str,str2);
+ 	sprintf(str2," %i, %i",_jour->month_counter, _jour->year);	strcat(str,str2);
+ 	strcat(str,")");
+-	Window()->SetTitle(str);
++	//Window()->SetTitle(str);
+ 
+ 	
+ 	//A l'ancienne
+@@ -567,4 +567,4 @@
+    			x->Close();
+ 			delete upBitmap;
+    			delete downBitmap;  			
+-}
+\ No newline at end of file
++}
+diff -Naur W6Haiku/W6.cpp W6Haiku-haiku/W6.cpp
+--- W6Haiku/W6.cpp	2008-08-16 04:35:06.002359296 +0000
++++ W6Haiku-haiku/W6.cpp	2013-01-13 12:00:52.285736960 +0000
+@@ -89,9 +89,9 @@
+  	
+  	
+  	//classe qui tourne en permanence et qui fait les daypassed (et par conséquent, les battle etc. 
+-	run_me = new Running(_country,_group,_politic,_weapon,_jour);
++	//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->Lock();  
+ 	runWin->Show(); //faut faire show pour lancer le pulse dans les views
+ 	runWin->Hide(); //quitte à hider la window ensuite