diff --git a/dev-lang/yab/yab-1.7.02.recipe b/dev-lang/yab/yab-1.7.02.recipe
new file mode 100644
index 000000000..bf0e698f2
--- /dev/null
+++ b/dev-lang/yab/yab-1.7.02.recipe
@@ -0,0 +1,77 @@
+SUMMARY="yab is an extended version of yabsic, a BASIC programming language"
+DESCRIPTION="
+yab is an extended version of yabasic, a BASIC programming language, with \
+special commands designed for Haiku.
+"
+HOMEPAGE="http://sourceforge.net/projects/yab-interpreter"
+SRC_URI="git+https://github.com/bbjimmy/Yab.git#f4dcf31ed252a098337994aa7f03ec63bf44d544"
+
+
+REVISION="2"
+
+LICENSE="Artistic"
+
+COPYRIGHT="1995-2006 Marc-Oliver Ihm (yabasic)
+	2006-2009 Jan Bungeroth (yab improvements)
+	2013 Jim Saxton ( yab improvements)"
+
+ARCHITECTURES="x86_gcc2 x86 ?x86_64"
+#SOURCE_DIR="yab-$portVersion"
+
+PROVIDES="
+	yab = $portVersion compat >=1.7.02 
+	cmd:yab= $portVersion compat >=1.7.02 
+	
+	"
+
+REQUIRES="
+	haiku$secondaryArchSuffix >= $haikuVersion
+	lib:libncurses$secondaryArchSuffix
+	"
+
+BUILD_REQUIRES="
+	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	devel:libncurses$secondaryArchSuffix
+	"
+
+BUILD_PREREQUIRES="
+	cmd:bison
+	cmd:flex
+	cmd:gcc$secondaryArchSuffix
+	cmd:make
+	cmd:mkdepend
+	cmd:perl
+	makefile_engine
+	"
+
+BUILD()
+{	
+	mkdir -p tmp
+	cp -r src/* tmp
+	cd tmp
+	make $jobArgs BUILDHOME=`finddir B_SYSTEM_DEVELOP_DIRECTORY`
+	unzip -o App_YAB.zip
+	copyattr App_YAB yab
+	
+}
+
+INSTALL()
+{	
+	
+		
+	mkdir -p $binDir
+	
+	cp tmp/yab  $binDir/
+	
+	mkdir -p $documentationDir
+	
+	cp -r Documentation/ $documentationDir/yab-1.7.02
+	
+	mkdir -p $appsDir/yab-IDE
+
+	cp -r src $appsDir/yab-IDE/src
+	cp -r Documentation $appsDir/yab-IDE/Documentation
+	
+
+	
+}
diff --git a/haiku-apps/yab/yab-1.6.recipe b/haiku-apps/yab/yab-1.6.recipe
deleted file mode 100644
index 3fcda61c9..000000000
--- a/haiku-apps/yab/yab-1.6.recipe
+++ /dev/null
@@ -1,32 +0,0 @@
-SUMMARY="yab is an extended version of yabsic, a BASIC programming language"
-DESCRIPTION="
-yab is an extended version of yabasic, a BASIC programming language, with \
-special commands designed for BeOS, Haiku and Zeta.
-"
-HOMEPAGE="http://sourceforge.net/projects/yab-interpreter" 
-SRC_URI="http://ports-space.haiku-files.org/haiku-apps/source/yab-1.6.zip"
-REVISION="1"
-STATUS_HAIKU="stable"
-DEPEND=""
-CHECKSUM_MD5="071e8653265a60fea96cceab46f67e5b"
-BUILD()
-{
-	cd yab-1.6/src
-	make clean
-	make
-}
-
-INSTALL()
-{
-	cd yab-1.6
-	mkdir -p ${DESTDIR}/boot/apps/yab
-	cp -a src/yab ${DESTDIR}/boot/apps/yab
-	cp -a Documentation ${DESTDIR}/boot/apps/yab
-	cp -a Programs ${DESTDIR}/boot/apps/yab
-	cp -a yab-IDE ${DESTDIR}/boot/apps/yab
-}
-
-LICENSE="Artistic
-	GNU GPL v2"
-COPYRIGHT="1995-2006 Marc-Oliver Ihm (yabasic)
-	2006-2009 Jan Bungeroth (yab improvements)"
diff --git a/haiku-apps/yab/yab-1.7.recipe b/haiku-apps/yab/yab-1.7.recipe
deleted file mode 100644
index 580637ebe..000000000
--- a/haiku-apps/yab/yab-1.7.recipe
+++ /dev/null
@@ -1,59 +0,0 @@
-SUMMARY="yab is an extended version of yabsic, a BASIC programming language"
-DESCRIPTION="
-yab is an extended version of yabasic, a BASIC programming language, with \
-special commands designed for BeOS, Haiku and Zeta.
-"
-HOMEPAGE="http://sourceforge.net/projects/yab-interpreter"
-SRC_URI="git+https://github.com/HaikuArchives/Yab.git"
-REVISION="2"
-#CHECKSUM_MD5="2b465895d9eb2e8383f035dd67b88a20"
-LICENSE="Artistic
-	GNU GPL v2"
-COPYRIGHT="1995-2006 Marc-Oliver Ihm (yabasic)
-	2006-2009 Jan Bungeroth (yab improvements)"
-
-ARCHITECTURES="!x86_gcc2 !x86 !x86_64"
-SECONDARY_ARCHITECTURE="!x86_gcc2 !x86"
-
-#SOURCE_DIR="yab-$portVersion"
-
-PROVIDES="
-	yab$secondaryArchSuffix = $portVersion
-	cmd:yab$secondaryArchSuffix
-	"
-
-REQUIRES="
-	haiku$secondaryArchSuffix >= $haikuVersion
-	lib:ncurses$secondaryArchSuffix
-	"
-
-BUILD_REQUIRES="
-	haiku${secondaryArchSuffix}_devel >= $haikuVersion
-	devel:libncurses$secondaryArchSuffix
-	"
-
-BUILD_PREREQUIRES="
-	cmd:bison
-	cmd:flex
-	cmd:gcc$secondaryArchSuffix
-	cmd:make
-	cmd:mkdepend
-	cmd:perl
-	makefile_engine
-	"
-
-BUILD()
-{
-	cd src
-	make $jobArgs BUILDHOME=`finddir B_SYSTEM_DEVELOP_DIRECTORY`
-}
-
-INSTALL()
-{
-	$YABDIR=$appsDir/yab
-	mkdir -p ${YABDIR}
-	cp -a ${YABDIR}apps/yab
-	cp -a Documentation ${YABDIR}
-	cp -a Programs ${YABDIR}
-	cp -a yab-IDE ${YABDIR}
-}
diff --git a/haiku-apps/yab_ide/yab_ide-2.2.1.recipe b/haiku-apps/yab_ide/yab_ide-2.2.1.recipe
new file mode 100644
index 000000000..055257e4e
--- /dev/null
+++ b/haiku-apps/yab_ide/yab_ide-2.2.1.recipe
@@ -0,0 +1,83 @@
+SUMMARY="Yab ide is an integrated development environment for yab. "
+DESCRIPTION="
+Yab allows fast prototyping with simple and clean code. yab contains a large number of BeAPI specific commands for GUI creation and much, much more.
+"
+HOMEPAGE="http://sourceforge.net/projects/yab-interpreter"
+SRC_URI="git+https://github.com/bbjimmy/Yab.git#f4dcf31ed252a098337994aa7f03ec63bf44d544"
+REVISION="2"
+
+LICENSE="Artistic"
+COPYRIGHT="1995-2006 Marc-Oliver Ihm (yabasic)
+	2006-2009 Jan Bungeroth (yab improvements)
+	2013 Jim Saxton ( yab improvements)"
+
+ARCHITECTURES="x86_gcc2 x86 ?x86_64"
+
+
+#SOURCE_DIR="yab_ide-$portVersion"
+
+PROVIDES="
+	yab_ide$secondaryArchSuffix = $portVersion
+		"
+
+REQUIRES="
+	haiku$secondaryArchSuffix >= $haikuVersion
+	lib:libncurses$secondaryArchSuffix
+	yab$secondaryArchSuffix >=1.7.02 
+	devel:libncurses$secondaryArchSuffix
+	devel:libz$secondaryArchSuffix	
+	"
+
+BUILD_REQUIRES="
+	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	devel:libncurses$secondaryArchSuffix
+	devel:libz$secondaryArchSuffix	
+"
+
+BUILD_PREREQUIRES="
+	cmd:bison
+	cmd:flex
+	cmd:gcc$secondaryArchSuffix
+	cmd:make
+	cmd:mkdepend
+	cmd:perl
+	makefile_engine
+	"
+
+BUILD()
+{
+	cd src
+	make $jobArgs BUILDHOME=`finddir B_SYSTEM_DEVELOP_DIRECTORY`
+	unzip -o App_YAB.zip
+	copyattr App_YAB yab
+}
+
+INSTALL()
+{	
+	
+	
+	
+	mkdir -p $binDir
+	
+	
+
+	mkdir -p tmp
+	mkdir -p tmp/buildfactory
+	cp -r src/* tmp/buildfactory 
+	cp -r yab-IDE/BuildFactory/* tmp/buildfactory/
+	unzip -o tmp/buildfactory/parts/yabstuff.zip -d tmp/buildfactory/parts
+	cp yab-IDE/src/yab-IDE.yab  tmp/buildfactory/	
+	cd tmp/buildfactory
+	BuildFactory.yab yab-IDE yab-IDE.yab application/x-vnd.yab-IDE	
+	cd ..
+	cd ..
+ 	
+	
+	mkdir -p $appsDir
+	cp -r yab-IDE/ $appsDir/
+	cp  tmp/buildfactory/yab-IDE $appsDir/yab-IDE/
+	cp yab-IDE/src/yab-IDE.yab $appsDir/yab-IDE/src/
+	
+
+	
+}