diff --git a/app-text/sword/sword-1.7.3.recipe b/app-text/sword/sword-1.7.3.recipe
index 836e1dd43..1ea0242ac 100644
--- a/app-text/sword/sword-1.7.3.recipe
+++ b/app-text/sword/sword-1.7.3.recipe
@@ -1,24 +1,28 @@
-SUMMARY="the biblical text research engine"
-
+SUMMARY="The biblical text research engine"
 DESCRIPTION="The SWORD Project is the CrossWire Bible Society's free Bible \
 software project. Its purpose is to create cross-platform open-source tools-- \
 covered by the GNU General Public License-- that allow programmers and Bible \
 societies to write new Bible software more quickly and easily. We also create \
 Bible study software for all readers, students, scholars, and translators of \
-the Bible, and have a growing collection of over 200 texts in over 50 languages
-"
-
+the Bible, and have a growing collection of over 200 texts in over 50 languages."
 HOMEPAGE="http://www.crosswire.org/sword"
 LICENSE="GNU GPL v2"
-COPYRIGHT="Copyright 1998-2014 CrossWire Bible Society"
+COPYRIGHT="1998-2014 CrossWire Bible Society"
 SRC_URI="http://www.crosswire.org/ftpmirror/pub/sword/source/v1.7/sword-1.7.3.tar.gz"
 CHECKSUM_SHA256="5a3d87ff155d5ecb0cfec052ba333b2b74d9273e2cc66fb1ca75747dfd8ea9ea"
-REVISION="1"
-ARCHITECTURES="x86_gcc2 x86"
+REVISION="3"
+ARCHITECTURES="x86 ?x86_64"
+if [ $effectiveTargetArchitecture != x86_gcc2 ]; then
+    # x86_gcc2 is fine as primary target architecture as long as we're building
+    # for a different secondary architecture.
+    ARCHITECTURES="$ARCHITECTURES x86_gcc2"
+else
+    ARCHITECTURES="$ARCHITECTURES !x86_gcc2"
+fi
 SECONDARY_ARCHITECTURES="x86"
 
 PROVIDES="
-	libsword$secondaryArchSuffix = $portVersion
+	sword$secondaryArchSuffix = $portVersion
 	cmd:diatheke$secondaryArchSuffix = $portVersion
 	cmd:imp2gbs$secondaryArchSuffix = $portVersion
 	cmd:imp2ld$secondaryArchSuffix = $portVersion
@@ -36,7 +40,11 @@ PROVIDES="
 	cmd:vs2osisreftxt$secondaryArchSuffix = $portVersion
 	cmd:xml2gbs$secondaryArchSuffix = $portVersion
 	lib:libsword$secondaryArchSuffix = $portVersion
-	lib:libsword$secondaryArchSuffix = $portVersion
+	"
+	
+PROVIDES_devel="
+	sword${secondaryArchSuffix}_devel = $portVersion
+	devel:libsword$secondaryArchSuffix = $portVersion
 	"
 
 REQUIRES="
@@ -44,7 +52,12 @@ REQUIRES="
 	lib:libcurl$secondaryArchSuffix
 	lib:libssl$secondaryArchSuffix
 	lib:libcrypto$secondaryArchSuffix
-	lib:libz$libcrypto$secondaryArchSuffix
+	lib:libz$secondaryArchSuffix
+	"
+
+REQUIRES_devel="
+	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	sword$secondaryArchSuffix == $portVersion base
 	"
 
 BUILD_REQUIRES="
@@ -66,7 +79,6 @@ BUILD_PREREQUIRES="
 
 BUILD()
 {
-	echo true
 	runConfigure ./configure --without-conf --without-clucene
 	make $jobArgs
 }
@@ -74,4 +86,10 @@ BUILD()
 INSTALL()
 {
 	make $jobArgs install
+	
+	prepareInstalledDevelLibs \
+		libsword
+	
+	packageEntries devel \
+		$developDir
 }
diff --git a/haiku-apps/resourceedit/resourceedit-1.0_git.recipe b/haiku-apps/resourceedit/resourceedit-1.0_git.recipe
new file mode 100644
index 000000000..d1b8a0cc2
--- /dev/null
+++ b/haiku-apps/resourceedit/resourceedit-1.0_git.recipe
@@ -0,0 +1,46 @@
+SUMMARY="Graphical RSRC resource editor"
+DESCRIPTION="An editor for binary resource files (.rsrc) that get compiled \
+into an application and can then be used within the application."
+HOMEPAGE="https://github.com/HaikuArchives/ResourceEdit"
+LICENSE="MIT"
+COPYRIGHT="2012-2013 Tri-Edge AI"
+SRC_URI="https://github.com/HaikuArchives/ResourceEdit/archive/8c3f779d08525ed1e607627213278436a0502125.tar.gz"
+CHECKSUM_SHA256="848b4e6d8a30737793d858d95360d33219efa615635b0b79c845bc4b78f6a64b"
+SOURCE_DIR="ResourceEdit-8c3f779d08525ed1e607627213278436a0502125"
+REVISION="1"
+
+ARCHITECTURES="x86_gcc2 ?x86 ?x86_64"
+
+PROVIDES="
+	resourceedit = $portVersion
+	app:ResourceEdit = $portVersion
+	"
+
+REQUIRES="
+	haiku >= $haikuVersion
+	"
+
+BUILD_REQUIRES="
+	haiku_devel >= $haikuVersion
+	"
+BUILD_PREREQUIRES="
+	makefile_engine
+	cmd:gcc
+	cmd:ld
+	cmd:make
+	cmd:mkdepend
+	"
+
+BUILD()
+{
+	cd source
+	make $jobArgs OBJ_DIR=objects
+}
+
+INSTALL()
+{
+	cd source
+	mkdir -p $appsDir
+	cp objects/ResourceEdit $appsDir
+	addAppDeskbarSymlink $appsDir/ResourceEdit
+}
diff --git a/haiku-apps/resourceedit/resourceedit-1.recipe b/haiku-apps/resourceedit/resourceedit-1.recipe
deleted file mode 100644
index 76bd028e5..000000000
--- a/haiku-apps/resourceedit/resourceedit-1.recipe
+++ /dev/null
@@ -1,52 +0,0 @@
-DESCRIPTION="
-This is an editor for resource files (.rsrc), binary files that get compiled \
-into an application and can then be accessed by that application.
-"
-SUMMARY="Resource editor"
-HOMEPAGE="https://github.com/HaikuArchives/ResourceEdit"
-LICENSE="MIT"
-COPYRIGHT="2012-2013 Tri-Edge AI"
-SRC_URI="git+https://github.com/HaikuArchives/ResourceEdit.git#1873c33591e2d2ccb3dccb692c175e9f10a0e450"
-REVISION="1"
-
-ARCHITECTURES="!x86 ?x86_64"
-if [ $effectiveTargetArchitecture != x86_gcc2 ]; then
-	# x86_gcc2 is fine as primary target architecture as long as we're building
-	# for a different secondary architecture.
-	ARCHITECTURES="$ARCHITECTURES x86_gcc2"
-else
-	ARCHITECTURES="$ARCHITECTURES !x86_gcc2"
-fi
-SECONDARY_ARCHITECTURES="!x86"
-
-PROVIDES="
-	resourceedit$secondaryArchSuffix = $portVersion
-	app:ResourceEdit = $portVersion
-	"
-
-REQUIRES="
-	haiku$secondaryArchSuffix >= $haikuVersion
-	"
-BUILD_REQUIRES="
-	haiku${secondaryArchSuffix}_devel >= $haikuVersion
-	"
-BUILD_PREREQUIRES="
-	makefile_engine
-	cmd:gcc$secondaryArchSuffix
-	cmd:ld$secondaryArchSuffix
-	cmd:make
-	cmd:mkdepend
-	"
-	
-BUILD()
-{
-	make
-}
-
-INSTALL()
-{
-	# supports "x86" architecture only
-	mkdir $appsDir
-	cp objects.x86-gcc4-release/ResourceEdit $appsDir
-	addAppDeskbarSymlink $appsDir/ResourceEdit
-}
diff --git a/haiku-apps/timecop/timecop-0.61.recipe b/haiku-apps/timecop/timecop-0.61.recipe
new file mode 100644
index 000000000..a292964a7
--- /dev/null
+++ b/haiku-apps/timecop/timecop-0.61.recipe
@@ -0,0 +1,47 @@
+SUMMARY="TimeCop helps you collect statistics about your computer working"
+DESCRIPTION="
+You want to know, how much time you spend in front of your computer?
+You want to know, how often your computer crashes?
+
+So you can use TimeCop to write a protocol of your computer sessions.
+"
+HOMEPAGE="http://www.augusta.de/michael/BeOS/TimeCop/index.us.html"
+SRC_URI="git://github.com/HaikuArchives/TimeCop.git#ee79c42895"
+REVISION="2"
+LICENSE="GNU GPL v2"
+COPYRIGHT="Copyright Michael Pieper"
+ARCHITECTURES="x86_gcc2 x86 !ppc"
+CHECKSUM_SHA256="d384c22c8768298fb1d9ea60fbdb8e7f7e440c00bae44c37e7507f20c4fe6a94"
+
+REQUIRES="
+	haiku >= $haikuVersion 
+"
+	
+PROVIDES="
+	cmd:TimeCop_daemon = $portVersion
+	app:TimeCop = $portVersion
+"
+
+BUILD_REQUIRES="
+	haiku_devel >= $haikuVersion
+"
+
+BUILD_PREREQUIRES="
+	cmd:make
+	cmd:gcc
+"
+	
+BUILD()
+{
+	make
+}
+
+INSTALL()
+{
+	mkdir -p $binDir
+	mkdir -p $appsDir
+	cp -a $sourceDir/bin/TimeCop_daemon $binDir/TimeCop_daemon
+	cp -a $sourceDir/bin/TimeCop $appsDir/TimeCop
+	
+	addAppDeskbarSymlink $appsDir/TimeCop
+}
diff --git a/sys-devel/arm_none_eabi_gcc/arm_none_eabi_gcc-4.8.2_2014_03_20.recipe b/sys-devel/arm_none_eabi_gcc/arm_none_eabi_gcc-4.8.4.recipe
similarity index 92%
rename from sys-devel/arm_none_eabi_gcc/arm_none_eabi_gcc-4.8.2_2014_03_20.recipe
rename to sys-devel/arm_none_eabi_gcc/arm_none_eabi_gcc-4.8.4.recipe
index 34695a5f5..bee70d846 100644
--- a/sys-devel/arm_none_eabi_gcc/arm_none_eabi_gcc-4.8.2_2014_03_20.recipe
+++ b/sys-devel/arm_none_eabi_gcc/arm_none_eabi_gcc-4.8.4.recipe
@@ -4,11 +4,10 @@ Compiler for ARM processors.
 "
 HOMEPAGE="http://gcc.gnu.org"
 
-srcGitRev="c20a732df8f8b6d0f32c872817f3a0498a5c4761"
-SRC_URI="https://github.com/haiku/buildtools/archive/$srcGitRev.tar.gz"
-CHECKSUM_SHA256="6d3b677cd8ef777bf6fb3186a15b5122e46345595a996370325c758b3d8a4ab6"
+SRC_URI="svn://gcc.gnu.org/svn/gcc/branches/ARM/embedded-4_8-branch"
 SRC_FILENAME="$portVersionedName.tar.gz"
-REVISION="2"
+PATCHES="arm_none_eabi_gcc-$portVersion.patchset"
+REVISION="1"
 LICENSE="
 	GNU GPL v2
 	GNU LGPL v2
@@ -47,6 +46,9 @@ REQUIRES="
 BUILD_REQUIRES="
 	cmd:${targetU}_as$secondaryArchSuffix
 	${targetU}_newlib$secondaryArchSuffix
+	devel:libgmp$secondaryArchSuffix
+	devel:libmpfr$secondaryArchSuffix
+	devel:libmpc$secondaryArchSuffix
 	"
 BUILD_PREREQUIRES="
 	haiku${secondaryArchSuffix}_devel >= $haikuVersion
@@ -65,8 +67,6 @@ BUILD_PREREQUIRES="
 	cmd:xargs
 	"
 
-SOURCE_DIR="buildtools-$srcGitRev/gcc"
-
 sourceDir=$(pwd)
 relativeInstallDir="develop/tools/${targetArch}"
 installDir="$prefix/$relativeInstallDir"
@@ -97,6 +97,7 @@ BUILD()
 		--docdir=$docDir --disable-nls --disable-libssp --with-gnu-ld \
 		--enable-languages=c,c++ --enable-lto --enable-frame-pointer \
 		--enable-multilib --disable-shared \
+		--with-multilib-list=armv6-m,armv7-m,armv7e-m,armv7-r \
 		--with-newlib --with-sysroot=$installDir \
 		--with-native-system-header-dir=/include \
 		--with-pkgversion=$(echo $portVersion | cut -c 7-) --target=$targetArch
diff --git a/sys-devel/arm_none_eabi_gcc/patches/arm_none_eabi_gcc-4.8.4.patchset b/sys-devel/arm_none_eabi_gcc/patches/arm_none_eabi_gcc-4.8.4.patchset
new file mode 100644
index 000000000..11b29c31a
--- /dev/null
+++ b/sys-devel/arm_none_eabi_gcc/patches/arm_none_eabi_gcc-4.8.4.patchset
@@ -0,0 +1,22 @@
+From e0f435a01b68a41b06602dcf4b302d7ad7f3974f Mon Sep 17 00:00:00 2001
+From: Adrien Destugues <pulkomandy@gmail.com>
+Date: Fri, 5 Dec 2014 18:05:55 +0100
+Subject: Hardcoded -lm.
+
+
+diff --git a/gcc/Makefile.in b/gcc/Makefile.in
+index 56b7baa..c9eedf6 100644
+--- a/gcc/Makefile.in
++++ b/gcc/Makefile.in
+@@ -3969,7 +3969,7 @@ $(genprogerr:%=build/gen%$(build_exeext)): $(BUILD_ERRORS)
+ genprog = $(genprogerr) check checksum condmd
+ 
+ # These programs need libs over and above what they get from the above list.
+-build/genautomata$(build_exeext) : BUILD_LIBS += -lm
++#build/genautomata$(build_exeext) : BUILD_LIBS += -lm
+ 
+ # These programs are not linked with the MD reader.
+ build/gengtype$(build_exeext) : build/gengtype-lex.o build/gengtype-parse.o \
+-- 
+1.8.3.4
+
diff --git a/sys-devel/arm_none_eabi_gcc_nolibc/arm_none_eabi_gcc_nolibc-4.8.2_2014_03_20.recipe b/sys-devel/arm_none_eabi_gcc_nolibc/arm_none_eabi_gcc_nolibc-4.8.4.recipe
similarity index 90%
rename from sys-devel/arm_none_eabi_gcc_nolibc/arm_none_eabi_gcc_nolibc-4.8.2_2014_03_20.recipe
rename to sys-devel/arm_none_eabi_gcc_nolibc/arm_none_eabi_gcc_nolibc-4.8.4.recipe
index a297b698a..6d61d526e 100644
--- a/sys-devel/arm_none_eabi_gcc_nolibc/arm_none_eabi_gcc_nolibc-4.8.2_2014_03_20.recipe
+++ b/sys-devel/arm_none_eabi_gcc_nolibc/arm_none_eabi_gcc_nolibc-4.8.4.recipe
@@ -4,10 +4,9 @@ Compiler for ARM processors.
 "
 HOMEPAGE="http://gcc.gnu.org"
 
-srcGitRev="c20a732df8f8b6d0f32c872817f3a0498a5c4761"
-SRC_URI="https://github.com/haiku/buildtools/archive/$srcGitRev.tar.gz"
-CHECKSUM_SHA256="6d3b677cd8ef777bf6fb3186a15b5122e46345595a996370325c758b3d8a4ab6"
+SRC_URI="svn://gcc.gnu.org/svn/gcc/branches/ARM/embedded-4_8-branch"
 SRC_FILENAME="$portVersionedName.tar.gz"
+PATCHES="arm_none_eabi_gcc_nolibc-$portVersion.patchset"
 REVISION="1"
 LICENSE="
 	GNU GPL v2
@@ -43,9 +42,15 @@ REQUIRES="
 	haiku$secondaryArchSuffix >= $haikuVersion
 	cmd:${targetU}_as$secondaryArchSuffix
 	lib:libstdc++$secondaryArchSuffix
+	lib:libgmp$secondaryArchSuffix
+	lib:libmpfr$secondaryArchSuffix
+	lib:libmpc$secondaryArchSuffix
 	"
 BUILD_REQUIRES="
 	cmd:${targetU}_as$secondaryArchSuffix
+	devel:libgmp$secondaryArchSuffix
+	devel:libmpfr$secondaryArchSuffix
+	devel:libmpc$secondaryArchSuffix
 	"
 BUILD_PREREQUIRES="
 	haiku${secondaryArchSuffix}_devel >= $haikuVersion
@@ -64,8 +69,6 @@ BUILD_PREREQUIRES="
 	cmd:xargs
 	"
 
-SOURCE_DIR="buildtools-$srcGitRev/gcc"
-
 sourceDir=$(pwd)
 relativeInstallDir="develop/tools/${targetArch}"
 installDir="$prefix/$relativeInstallDir"
@@ -96,6 +99,7 @@ BUILD()
 		--docdir=$docDir --disable-nls --disable-libssp --with-gnu-ld \
 		--enable-languages=c,c++ --enable-lto --enable-frame-pointer \
 		--enable-multilib --disable-shared \
+		--with-multilib-list=armv6-m,armv7-m,armv7e-m,armv7-r \
 		--without-headers --with-newlib \
 		--with-sysroot=$installDir \
 		--with-native-system-header-dir=/include \
diff --git a/sys-devel/arm_none_eabi_gcc_nolibc/patches/arm_none_eabi_gcc_nolibc-4.8.2_2014_03_20.patchset b/sys-devel/arm_none_eabi_gcc_nolibc/patches/arm_none_eabi_gcc_nolibc-4.8.2_2014_03_20.patchset
new file mode 100644
index 000000000..11b29c31a
--- /dev/null
+++ b/sys-devel/arm_none_eabi_gcc_nolibc/patches/arm_none_eabi_gcc_nolibc-4.8.2_2014_03_20.patchset
@@ -0,0 +1,22 @@
+From e0f435a01b68a41b06602dcf4b302d7ad7f3974f Mon Sep 17 00:00:00 2001
+From: Adrien Destugues <pulkomandy@gmail.com>
+Date: Fri, 5 Dec 2014 18:05:55 +0100
+Subject: Hardcoded -lm.
+
+
+diff --git a/gcc/Makefile.in b/gcc/Makefile.in
+index 56b7baa..c9eedf6 100644
+--- a/gcc/Makefile.in
++++ b/gcc/Makefile.in
+@@ -3969,7 +3969,7 @@ $(genprogerr:%=build/gen%$(build_exeext)): $(BUILD_ERRORS)
+ genprog = $(genprogerr) check checksum condmd
+ 
+ # These programs need libs over and above what they get from the above list.
+-build/genautomata$(build_exeext) : BUILD_LIBS += -lm
++#build/genautomata$(build_exeext) : BUILD_LIBS += -lm
+ 
+ # These programs are not linked with the MD reader.
+ build/gengtype$(build_exeext) : build/gengtype-lex.o build/gengtype-parse.o \
+-- 
+1.8.3.4
+
diff --git a/sys-libs/arm_none_eabi_newlib/arm_none_eabi_newlib-2.1.0.recipe b/sys-libs/arm_none_eabi_newlib/arm_none_eabi_newlib-2.1.0.recipe
index 5d11ea2a2..ba683bc56 100644
--- a/sys-libs/arm_none_eabi_newlib/arm_none_eabi_newlib-2.1.0.recipe
+++ b/sys-libs/arm_none_eabi_newlib/arm_none_eabi_newlib-2.1.0.recipe
@@ -35,7 +35,7 @@ COPYRIGHT="
 2009 ARM Ltd
 2008 Ed Schouten <ed@FreeBSD.org>
 "
-REVISION="1"
+REVISION="2"
 
 ARCHITECTURES=""
 if [ $effectiveTargetArchitecture != x86_gcc2 ]; then
@@ -77,7 +77,7 @@ BUILD()
 	cd $objectsDir
 
 	runConfigure $sourceDir/configure --target=arm-none-eabi \
-		--prefix=$installDir
+		--prefix=$installDir --disable-newlib-supplied-syscalls
 	make
 }