diff --git a/dev-lang/yab/yab-1.7.02.recipe b/dev-lang/yab/yab-1.7.02.recipe
index bf0e698f2..45caf7219 100644
--- a/dev-lang/yab/yab-1.7.02.recipe
+++ b/dev-lang/yab/yab-1.7.02.recipe
@@ -4,7 +4,7 @@ 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"
+SRC_URI="git+https://github.com/HaikuArchives/Yab.git#a5681d8a3403c142eae0ad416a59abd2aa7a28e4"
 
 
 REVISION="2"
diff --git a/haiku-apps/yab_ide/yab_ide-2.2.1.recipe b/haiku-apps/yab_ide/yab_ide-2.2.1.recipe
index 055257e4e..0a2e295dc 100644
--- a/haiku-apps/yab_ide/yab_ide-2.2.1.recipe
+++ b/haiku-apps/yab_ide/yab_ide-2.2.1.recipe
@@ -3,7 +3,7 @@ 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"
+SRC_URI="git+https://github.com/HaikuArchives/Yab.git#a5681d8a3403c142eae0ad416a59abd2aa7a28e4"
 REVISION="2"
 
 LICENSE="Artistic"
@@ -54,16 +54,10 @@ BUILD()
 
 INSTALL()
 {	
-	
-	
-	
 	mkdir -p $binDir
-	
-	
-
 	mkdir -p tmp
 	mkdir -p tmp/buildfactory
-	cp -r src/* 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/	
@@ -71,13 +65,8 @@ INSTALL()
 	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/
-	
-
-	
 }