diff --git a/haiku-apps/burnitnow/burnitnow-27.recipe b/haiku-apps/burnitnow/burnitnow-27.recipe
deleted file mode 100644
index 7d9667d50..000000000
--- a/haiku-apps/burnitnow/burnitnow-27.recipe
+++ /dev/null
@@ -1,33 +0,0 @@
-DESCRIPTION="BurnItNow - GUI CD burning app for Haiku" 
-HOMEPAGE="http://dev.osdrawer.net/projects/burnitnow" 
-SRC_URI="svn+http://svn.osdrawer.net/burnitnow/branches/legacy#27"
-REVISION="1"
-STATUS_HAIKU="stable"
-DEPEND="dev-util/cmake >= 2.8.0
-	app-cdr/cdrtools > 3.00"
-#CHECKSUM_MD5=""
-BUILD()
-{
-	cd burnitnow-27
-	cmake .
-	make
-}
-
-INSTALL()
-{
-       cd burnitnow-27
-       mkdir -p ${DESTDIR}/boot/apps/BurnItNow
-       cp -a BurnItNow ${DESTDIR}/boot/apps/BurnItNow
-       cp -a LICENSE ${DESTDIR}/boot/apps/BurnItNow/LICENSE
-       cp -a TODO ${DESTDIR}/boot/apps/BurnItNow/TODO
-       cp -a README ${DESTDIR}/boot/apps/BurnItNow/README
-       mkdir -p ${DESTDIR}/boot/apps/BurnItNow/Docs
-       cp -a Docs/BurnItNowHelp.html ${DESTDIR}/boot/apps/BurnItNow/Docs/BurnItNowHelp.html
-       cp -a Docs/helpbg.gif ${DESTDIR}/boot/apps/BurnItNow/Docs/helpbg.gif
-       if [ -z ${DESTDIR} ];then
-               find /boot/apps/BurnItNow -type d -name ".svn" | xargs rm -rf
-       fi
-}
-LICENSE="MIT"
-COPYRIGHT="2000-2002 Johan Nilsson
-	2010 BurnItNow Maintainers"
diff --git a/haiku-apps/burnitnow/burnitnow-38.recipe b/haiku-apps/burnitnow/burnitnow-38.recipe
deleted file mode 100644
index 22f906cb4..000000000
--- a/haiku-apps/burnitnow/burnitnow-38.recipe
+++ /dev/null
@@ -1,33 +0,0 @@
-DESCRIPTION="BurnItNow - GUI CD burning app for Haiku" 
-HOMEPAGE="http://dev.osdrawer.net/projects/burnitnow" 
-SRC_URI="svn+http://svn.osdrawer.net/burnitnow/branches/legacy#38"
-REVISION="1"
-STATUS_HAIKU="stable"
-DEPEND="dev-util/cmake >= 2.8.0
-	app-cdr/cdrtools > 3.00"
-#CHECKSUM_MD5=""
-BUILD()
-{
-	cd burnitnow-38
-	cmake .
-	make
-}
-
-INSTALL()
-{
-       cd burnitnow-38
-       mkdir -p ${DESTDIR}/boot/apps/BurnItNow
-       cp -a BurnItNow ${DESTDIR}/boot/apps/BurnItNow
-       cp -a LICENSE ${DESTDIR}/boot/apps/BurnItNow/LICENSE
-       cp -a TODO ${DESTDIR}/boot/apps/BurnItNow/TODO
-       cp -a README ${DESTDIR}/boot/apps/BurnItNow/README
-       mkdir -p ${DESTDIR}/boot/apps/BurnItNow/Docs
-       cp -a Docs/BurnItNowHelp.html ${DESTDIR}/boot/apps/BurnItNow/Docs/BurnItNowHelp.html
-       cp -a Docs/helpbg.gif ${DESTDIR}/boot/apps/BurnItNow/Docs/helpbg.gif
-       if [ -z ${DESTDIR} ];then
-               find /boot/apps/BurnItNow -type d -name ".svn" | xargs rm -rf
-       fi
-}
-LICENSE="MIT"
-COPYRIGHT="2000-2002 Johan Nilsson
-	2010 BurnItNow Maintainers"
diff --git a/haiku-apps/burnitnow/burnitnow-39.recipe b/haiku-apps/burnitnow/burnitnow-39.recipe
deleted file mode 100644
index 4ed1fbf85..000000000
--- a/haiku-apps/burnitnow/burnitnow-39.recipe
+++ /dev/null
@@ -1,33 +0,0 @@
-DESCRIPTION="BurnItNow - GUI CD burning app for Haiku" 
-HOMEPAGE="http://dev.osdrawer.net/projects/burnitnow" 
-SRC_URI="svn+http://svn.osdrawer.net/burnitnow/branches/legacy#39"
-REVISION="1"
-STATUS_HAIKU="stable"
-DEPEND="dev-util/cmake >= 2.8.0
-	app-cdr/cdrtools > 3.00"
-#CHECKSUM_MD5=""
-BUILD()
-{
-	cd burnitnow-39
-	cmake .
-	make
-}
-
-INSTALL()
-{
-       cd burnitnow-39
-       mkdir -p ${DESTDIR}/boot/apps/BurnItNow
-       cp -a BurnItNow ${DESTDIR}/boot/apps/BurnItNow
-       cp -a LICENSE ${DESTDIR}/boot/apps/BurnItNow/LICENSE
-       cp -a TODO ${DESTDIR}/boot/apps/BurnItNow/TODO
-       cp -a README ${DESTDIR}/boot/apps/BurnItNow/README
-       mkdir -p ${DESTDIR}/boot/apps/BurnItNow/Docs
-       cp -a Docs/BurnItNowHelp.html ${DESTDIR}/boot/apps/BurnItNow/Docs/BurnItNowHelp.html
-       cp -a Docs/helpbg.gif ${DESTDIR}/boot/apps/BurnItNow/Docs/helpbg.gif
-       if [ -z ${DESTDIR} ];then
-               find /boot/apps/BurnItNow -type d -name ".svn" | xargs rm -rf
-       fi
-}
-LICENSE="MIT"
-COPYRIGHT="2000-2002 Johan Nilsson
-	2010 BurnItNow Maintainers"
diff --git a/haiku-apps/burnitnow/burnitnow-43.recipe b/haiku-apps/burnitnow/burnitnow-43.recipe
deleted file mode 100644
index 0d3dcdd90..000000000
--- a/haiku-apps/burnitnow/burnitnow-43.recipe
+++ /dev/null
@@ -1,33 +0,0 @@
-DESCRIPTION="BurnItNow - GUI CD burning app for Haiku" 
-HOMEPAGE="http://dev.osdrawer.net/projects/burnitnow" 
-SRC_URI="svn+http://svn.osdrawer.net/burnitnow/branches/legacy#43"
-REVISION="1"
-STATUS_HAIKU="stable"
-DEPEND="dev-util/cmake >= 2.8.0
-	app-cdr/cdrtools > 3.00"
-#CHECKSUM_MD5=""
-BUILD()
-{
-	cd burnitnow-43
-	cmake .
-	make
-}
-
-INSTALL()
-{
-       cd burnitnow-43
-       mkdir -p ${DESTDIR}/boot/apps/BurnItNow
-       cp -a BurnItNow ${DESTDIR}/boot/apps/BurnItNow
-       cp -a LICENSE ${DESTDIR}/boot/apps/BurnItNow/LICENSE
-       cp -a TODO ${DESTDIR}/boot/apps/BurnItNow/TODO
-       cp -a README ${DESTDIR}/boot/apps/BurnItNow/README
-       mkdir -p ${DESTDIR}/boot/apps/BurnItNow/Docs
-       cp -a Docs/BurnItNowHelp.html ${DESTDIR}/boot/apps/BurnItNow/Docs/BurnItNowHelp.html
-       cp -a Docs/helpbg.gif ${DESTDIR}/boot/apps/BurnItNow/Docs/helpbg.gif
-       if [ -z ${DESTDIR} ];then
-               find /boot/apps/BurnItNow -type d -name ".svn" | xargs rm -rf
-       fi
-}
-LICENSE="MIT"
-COPYRIGHT="2000-2002 Johan Nilsson
-	2010-2011 BurnItNow Maintainers"
diff --git a/haiku-apps/burnitnow/burnitnow-beta5_svn.recipe b/haiku-apps/burnitnow/burnitnow-beta5_svn.recipe
deleted file mode 100644
index d2c4e80e7..000000000
--- a/haiku-apps/burnitnow/burnitnow-beta5_svn.recipe
+++ /dev/null
@@ -1,33 +0,0 @@
-DESCRIPTION="BurnItNow - GUI CD burning app for Haiku" 
-HOMEPAGE="http://dev.osdrawer.net/projects/burnitnow" 
-SRC_URI="svn+http://svn.osdrawer.net/burnitnow/branches/legacy"
-REVISION="1"
-STATUS_HAIKU="stable"
-DEPEND="dev-util/cmake >= 2.8.0
-	app-cdr/cdrtools > 3.00"
-#CHECKSUM_MD5=""
-BUILD()
-{
-	cd burnitnow-beta5-svn
-	cmake .
-	make
-}
-
-INSTALL()
-{
-       cd burnitnow-beta5-svn
-       mkdir -p ${DESTDIR}/boot/apps/BurnItNow
-       cp -a BurnItNow ${DESTDIR}/boot/apps/BurnItNow
-       cp -a LICENSE ${DESTDIR}/boot/apps/BurnItNow/LICENSE
-       cp -a TODO ${DESTDIR}/boot/apps/BurnItNow/TODO
-       cp -a README ${DESTDIR}/boot/apps/BurnItNow/README
-       mkdir -p ${DESTDIR}/boot/apps/BurnItNow/Docs
-       cp -a Docs/BurnItNowHelp.html ${DESTDIR}/boot/apps/BurnItNow/Docs/BurnItNowHelp.html
-       cp -a Docs/helpbg.gif ${DESTDIR}/boot/apps/BurnItNow/Docs/helpbg.gif
-       if [ -z ${DESTDIR} ];then
-               find /boot/apps/BurnItNow -type d -name ".svn" | xargs rm -rf
-       fi
-}
-LICENSE="MIT"
-COPYRIGHT="2000-2002 Johan Nilsson
-	2010-2011 BurnItNow Maintainers"
diff --git a/haiku-apps/burnitnow/burnitnow-beta6.recipe b/haiku-apps/burnitnow/burnitnow-beta6.recipe
deleted file mode 100644
index 08a74e2e1..000000000
--- a/haiku-apps/burnitnow/burnitnow-beta6.recipe
+++ /dev/null
@@ -1,35 +0,0 @@
-DESCRIPTION="BurnItNow - GUI CD burning app for Haiku" 
-HOMEPAGE="http://github.com/scottmc/burnitnow" 
-SRC_URI="git://github.com/scottmc/BurnItNow.git#6367b5beb2"
-REVISION="1"
-STATUS_HAIKU="stable"
-DEPEND="app-cdr/cdrtools > 3.00"
-#CHECKSUM_MD5=""
-
-BUILD()
-{
-	cd burnitnow-beta6/legacy
-	cmake .
-	make
-}
-
-INSTALL()
-{
-	cd burnitnow-beta6/legacy
-	BURNITNOWDIR=${DESTDIR}/`finddir B_APPS_DIRECTORY`/BurnItNow
-	mkdir -p ${BURNITNOWDIR}/Docs
-	cp -a BurnItNow ${BURNITNOWDIR}
-	cp -a LICENSE ${BURNITNOWDIR}/LICENSE
-	cp -a TODO ${BURNITNOWDIR}/TODO
-	cp -a README ${BURNITNOWDIR}/README
-	cp -a AUTHORS ${BURNITNOWDIR}/AUTHORS
-	cp -a Changes ${BURNITNOWDIR}/Changes
-	cp -a Docs ${BURNITNOWDIR}/
-	if [ -z ${DESTDIR} ];then
-		find /boot/apps/BurnItNow -type d -name ".svn" | xargs rm -rf
-	fi
-}
-
-LICENSE="MIT"
-COPYRIGHT="2000-2002 Johan Nilsson
-	2010-2013 BurnItNow Maintainers"
diff --git a/haiku-apps/burnitnow/burnitnow-trunk.recipe b/haiku-apps/burnitnow/burnitnow-trunk.recipe
index 98d226421..55cebb202 100644
--- a/haiku-apps/burnitnow/burnitnow-trunk.recipe
+++ b/haiku-apps/burnitnow/burnitnow-trunk.recipe
@@ -1,18 +1,15 @@
 SUMMARY="A utility for burning CD"
 DESCRIPTION="BurnItNow is a CD burning utility application for Haiku"
 HOMEPAGE="https://github.com/HaikuArchives/BurnItNow"
-SRC_URI="git+https://github.com/HaikuArchives/BurnItNow#5036e55"
+SRC_URI="git+https://github.com/HaikuArchives/BurnItNow.git#3e7e69d048"
 REVISION="1"
 COPYRIGHT="
 	2010-2013 BurnItNow Team
-	2005-2007 Ingo Weinhold <bonefish@users.sf.net>
-	2007 Haiku, Inc.
-	1991-2000 Be Incorporated
 	"
 LICENSE="MIT"
 
-
-ARCHITECTURES="x86_gcc2 ?x86 ?x86_64"
+ARCHITECTURES="!x86_gcc2 ?x86 ?x86_64"
+SECONDARY_ARCHITECTURES="?x86"
 
 PROVIDES="
 	burnitnow = $portVersion
@@ -20,22 +17,22 @@ PROVIDES="
 	"
 
 REQUIRES="
+	haiku >= $haikuVersion
 	cmd:cdrecord
 	"
 
-BUILD_PREREQUIRES="
-	makefile_engine
-	cmd:cmake
-	cmd:make
-	cmd:gcc
-	"
-	
 BUILD_REQUIRES="
-	haiku_devel >= $haikuVersion
+	haiku${secondaryArchSuffix}_devel >= $haikuVersion
 	"
 
-SOURCE_DIR="$portName/trunk"
-		
+BUILD_PREREQUIRES="
+	cmd:cmake
+	cmd:make
+	cmd:gcc$secondaryArchSuffix
+	"
+
+SOURCE_DIR="$portName/burnitnow2"
+
 BUILD()
 {
 	cmake .