diff --git a/packs/optionalpackages/optionalpackages-0.6-gcc4.bep b/packs/optionalpackages/optionalpackages-0.6-gcc4.bep
index fdd7270a1..6bfe1177c 100644
--- a/packs/optionalpackages/optionalpackages-0.6-gcc4.bep
+++ b/packs/optionalpackages/optionalpackages-0.6-gcc4.bep
@@ -11,7 +11,7 @@ BUILD {
 	mkdir -p ../zips
 	mkdir -p ../sources
 	cd optionalpackages-0.5
-	export HAIKUVERSION="r1a3test"
+	export HAIKUVERSION="r1a3"
 ##
 
 #w = works
@@ -19,62 +19,65 @@ BUILD {
 #3 = 3rd party optional package, probably needs a .bep file
 
 
-#w	haikuporter -i readline-6.2
-#w	haikuporter -i libedit-20100424
-#w	haikuporter -y -d -i autoconf-2.68
-#w	mv ${HPLOC}/sys-devel/autoconf/*.zip ${HPLOC}/packs/optionalpackages/zips
-#w	haikuporter -y -d -i automake-1.11.1
-#w	mv ${HPLOC}/sys-devel/automake/*.zip ${HPLOC}/packs/optionalpackages/zips
-#w	haikuporter -y -d -i libtool-2.4
-#w	mv ${HPLOC}/sys-devel/libtool/*.zip ${HPLOC}/packs/optionalpackages/zips
-#w	haikuporter -y -d -i bison-2.4.3
-#w	mv ${HPLOC}/sys-devel/bison/*.zip ${HPLOC}/packs/optionalpackages/zips
-#w	haikuporter -y -d -i m4-1.4.16
-#w	mv ${HPLOC}/sys-devel/m4/*.zip ${HPLOC}/packs/optionalpackages/zips
-#w	haikuporter -y -d -i flex-2.5.35
-#w	mv ${HPLOC}/sys-devel/flex/*.zip ${HPLOC}/packs/optionalpackages/zips
-#w	haikuporter -y -d -i jam-2.5
-#w	mv ${HPLOC}/sys-devel/jam/*.zip ${HPLOC}/packs/optionalpackages/zips
-#w	haikuporter -y -d -i mkdepend-1.7
-#w	mv ${HPLOC}/haiku-apps/mkdepend/*.zip ${HPLOC}/packs/optionalpackages/zips
-#w	haikuporter -y -d -i make-3.82
-#w	mv ${HPLOC}/sys-devel/make/*.zip ${HPLOC}/packs/optionalpackages/zips
-#w	haikuporter -y -d -i cmake-2.8.4
-#w	mv ${HPLOC}/dev-util/cmake/*.zip ${HPLOC}/packs/optionalpackages/zips
-#w	haikuporter -y -d -i libxml2-2.7.8
-#w	mv ${HPLOC}/dev-libs/libxml2/*.zip ${HPLOC}/packs/optionalpackages/zips	
-#w	haikuporter -y -d -i libxslt-1.1.26
-#w	mv ${HPLOC}/dev-libs/libxslt/*.zip ${HPLOC}/packs/optionalpackages/zips	
+#	haikuporter -i readline-6.2
+#	haikuporter -y -d -i libedit-20100424
+#	haikuporter -y -d -i autoconf-2.68
+#	mv ${HPLOC}/sys-devel/autoconf/*.zip ${HPLOC}/packs/optionalpackages/zips
+#	haikuporter -y -d -i automake-1.11.1
+#	mv ${HPLOC}/sys-devel/automake/*.zip ${HPLOC}/packs/optionalpackages/zips
+#	haikuporter -y -d -i libtool-2.4
+#	mv ${HPLOC}/sys-devel/libtool/*.zip ${HPLOC}/packs/optionalpackages/zips
+#	haikuporter -y -d -i bison-2.4.3
+#	mv ${HPLOC}/sys-devel/bison/*.zip ${HPLOC}/packs/optionalpackages/zips
+#	haikuporter -y -d -i m4-1.4.16
+#	mv ${HPLOC}/sys-devel/m4/*.zip ${HPLOC}/packs/optionalpackages/zips
+#	haikuporter -y -d -i flex-2.5.35
+#	mv ${HPLOC}/sys-devel/flex/*.zip ${HPLOC}/packs/optionalpackages/zips
+#	haikuporter -y -d -i jam-2.5
+#	mv ${HPLOC}/sys-devel/jam/*.zip ${HPLOC}/packs/optionalpackages/zips
+#	haikuporter -y -d -i mkdepend-1.7
+#	mv ${HPLOC}/haiku-apps/mkdepend/*.zip ${HPLOC}/packs/optionalpackages/zips
+#	haikuporter -y -d -i make-3.82
+#	mv ${HPLOC}/sys-devel/make/*.zip ${HPLOC}/packs/optionalpackages/zips
+#	haikuporter -y -d -i cmake-2.8.4
+#	mv ${HPLOC}/dev-util/cmake/*.zip ${HPLOC}/packs/optionalpackages/zips
+#p	haikuporter -y -d -i libxml2-2.7.8
+#p	mv ${HPLOC}/dev-libs/libxml2/*.zip ${HPLOC}/packs/optionalpackages/zips	
+#p	haikuporter -y -d -i libxslt-1.1.26
+#p	mv ${HPLOC}/dev-libs/libxslt/*.zip ${HPLOC}/packs/optionalpackages/zips	
 	
-
-#w	haikuporter -y -d -i openssl-1.0.0d
-#w	mv ${HPLOC}/dev-libs/openssl/*.zip ${HPLOC}/packs/optionalpackages/zips
-#w	haikuporter -y -d -i curl-7.21.6
-#w	mv ${HPLOC}/net-misc/curl/*.zip ${HPLOC}/packs/optionalpackages/zips
-#w	haikuporter -y -d -i neon-0.29.6
-#w	mv ${HPLOC}/net-misc/neon/*.zip ${HPLOC}/packs/optionalpackages/zips	
-#w	haikuporter -y -d -i cvs-1.12.13.1
-#w	mv ${HPLOC}/dev-vcs/cvs/*.zip ${HPLOC}/packs/optionalpackages/zips
-#w	haikuporter -y -d -i subversion-1.6.15
-#w	mv ${HPLOC}/dev-vcs/subversion/*.zip ${HPLOC}/packs/optionalpackages/zips		
-#w	haikuporter -y -d -i git-1.7.5
-#w	mv ${HPLOC}/dev-vcs/git/*.zip ${HPLOC}/packs/optionalpackages/zips			
-#w	haikuporter -y -d -i openssh-5.8p2
-#w	mv ${HPLOC}/net-misc/openssh/*.zip ${HPLOC}/packs/optionalpackages/zips	
-#w	haikuporter -y -c -d -i mercurial-1.8.3
-#w	mv ${HPLOC}/dev-vcs/mercurial/*.zip ${HPLOC}/packs/optionalpackages/zips
+#	haikuporter -y -d -i yasm-1.1.0	
+#	mv ${HPLOC}/dev-lang/yasm/*.zip ${HPLOC}/packs/optionalpackages/zips
+#	haikuporter -y -d -i xz-utils-5.0.1
+#	mv ${HPLOC}/app-arch/xz-utils/*.zip ${HPLOC}/packs/optionalpackages/zips
+#	haikuporter -y -d -i openssl-1.0.0d
+#	mv ${HPLOC}/dev-libs/openssl/*.zip ${HPLOC}/packs/optionalpackages/zips
+#	haikuporter -y -d -i curl-7.21.6
+#	mv ${HPLOC}/net-misc/curl/*.zip ${HPLOC}/packs/optionalpackages/zips
+#	haikuporter -y -d -i neon-0.29.6
+#	mv ${HPLOC}/net-misc/neon/*.zip ${HPLOC}/packs/optionalpackages/zips	
+#	haikuporter -y -d -i cvs-1.12.13.1
+#	mv ${HPLOC}/dev-vcs/cvs/*.zip ${HPLOC}/packs/optionalpackages/zips
+	haikuporter -y -d -i subversion-1.6.15
+	mv ${HPLOC}/dev-vcs/subversion/*.zip ${HPLOC}/packs/optionalpackages/zips		
+	haikuporter -y -d -i git-1.7.5
+	mv ${HPLOC}/dev-vcs/git/*.zip ${HPLOC}/packs/optionalpackages/zips			
+	haikuporter -y -d -i openssh-5.8p2
+	mv ${HPLOC}/net-misc/openssh/*.zip ${HPLOC}/packs/optionalpackages/zips	
+	haikuporter -y -c -d -i mercurial-1.8.3
+	mv ${HPLOC}/dev-vcs/mercurial/*.zip ${HPLOC}/packs/optionalpackages/zips
 
 
-#w	haikuporter -y -c -d droid-113
-#w	mv ${HPLOC}/media-fonts/droid/*.zip ${HPLOC}/packs/optionalpackages/zips
+	haikuporter -y -c -d droid-113
+	mv ${HPLOC}/media-fonts/droid/*.zip ${HPLOC}/packs/optionalpackages/zips
 	haikuporter -y -d -i apr-1.4.2
 	mv ${HPLOC}/dev-libs/apr/*.zip ${HPLOC}/packs/optionalpackages/zips
 	haikuporter -y -d -i apr-util-1.3.10
 	mv ${HPLOC}/dev-libs/apr-util/*.zip ${HPLOC}/packs/optionalpackages/zips
 	haikuporter -y -d -i sqlite-3.7.5
 	mv ${HPLOC}/dev-db/sqlite/*.zip ${HPLOC}/packs/optionalpackages/zips	
-	haikuporter -y -d bzr-2.2.2
-	mv ${HPLOC}/dev-vcs/bzr/*.zip ${HPLOC}/packs/optionalpackages/zips
+#p	haikuporter -y -d bzr-2.2.2
+#p	mv ${HPLOC}/dev-vcs/bzr/*.zip ${HPLOC}/packs/optionalpackages/zips
 	haikuporter -y -d -i beae-22
 	mv ${HPLOC}/haiku-apps/beae/*.zip ${HPLOC}/packs/optionalpackages/zips	
 	haikuporter -y -d -i burnitnow-39
@@ -127,29 +130,23 @@ BUILD {
 	mv ${HPLOC}/sys-apps/sed/*.zip ${HPLOC}/packs/optionalpackages/zips	
 	haikuporter -y -d -i vision-908
 	mv ${HPLOC}/haiku-apps/vision/*.zip ${HPLOC}/packs/optionalpackages/zips
-	haikuporter -y -d -i yasm-1.1.0	
-	mv ${HPLOC}/dev-lang/yasm/*.zip ${HPLOC}/packs/optionalpackages/zips
-	haikuporter -y -d -i xz-utils-5.0.1
-	mv ${HPLOC}/app-arch/xz-utils/*.zip ${HPLOC}/packs/optionalpackages/zips
 
-#b	haikuporter -y -d -i vim-7.3
-#b	mv ${HPLOC}/app-editors/vim/*.zip ${HPLOC}/packs/optionalpackages/zips		
-#b	haikuporter -y -c -d bzr-2.2.2
-#b	mv ${HPLOC}/dev-vcs/bzr/*.zip ${HPLOC}/packs/optionalpackages/zips	
-#b	haikuporter -y -c -d -i transmission-2.01
-#b	mv ${HPLOC}/net-p2p/transmission/*.zip ${HPLOC}/packs/optionalpackages/zips
-#b	haikuporter -y -c -d -i paladin-1.3
-#b	mv ${HPLOC}/haiku-apps/paladin/*.zip ${HPLOC}/packs/optionalpackages/zips
-#b	haikuporter -y -c -d -i pe-2.4.3-600
-#b	mv ${HPLOC}/haiku-apps/pe/*.zip ${HPLOC}/packs/optionalpackages/zips
+	haikuporter -y -d -i vim-7.3
+	mv ${HPLOC}/app-editors/vim/*.zip ${HPLOC}/packs/optionalpackages/zips		
+	haikuporter -y -c -d -i transmission-2.01
+	mv ${HPLOC}/net-p2p/transmission/*.zip ${HPLOC}/packs/optionalpackages/zips
+	haikuporter -y -c -d -i paladin-1.3
+	mv ${HPLOC}/haiku-apps/paladin/*.zip ${HPLOC}/packs/optionalpackages/zips
+	haikuporter -y -c -d -i pe-2.4.3-600
+	mv ${HPLOC}/haiku-apps/pe/*.zip ${HPLOC}/packs/optionalpackages/zips
 #b	haikuporter -y -d -i opensound-4.2
 #b	mv ${HPLOC}/media-sound/opensound/*.zip ${HPLOC}/packs/optionalpackages/zips	
-#b	haikuporter -y -d -i pe-2.4.3-600
-#b	mv ${HPLOC}/haiku-apps/pe/*.zip ${HPLOC}/packs/optionalpackages/zips	
+	haikuporter -y -d -i pe-2.4.3-600
+	mv ${HPLOC}/haiku-apps/pe/*.zip ${HPLOC}/packs/optionalpackages/zips	
 #b	haikuporter -y -d  python-2.7.1
 #b	mv ${HPLOC}/dev-lang/python/*.zip ${HPLOC}/packs/optionalpackages/zips		
-#b	haikuporter -y -d -i tar-1.25
-#b	mv ${HPLOC}/app-arch/tar/*.zip ${HPLOC}/packs/optionalpackages/zips			
+	haikuporter -y -d -i tar-1.25
+	mv ${HPLOC}/app-arch/tar/*.zip ${HPLOC}/packs/optionalpackages/zips			
 #b	haikuporter -y -d -i netsurf-2.6
 #b	mv ${HPLOC}/www-client/netsurf/*.zip ${HPLOC}/packs/optionalpackages/zips