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/peek/peek-20140206.recipe b/haiku-apps/peek/peek-20140206.recipe
new file mode 100644
index 000000000..40d499dfc
--- /dev/null
+++ b/haiku-apps/peek/peek-20140206.recipe
@@ -0,0 +1,47 @@
+SUMMARY="Image browser"
+DESCRIPTION="
+Peek is a free image browser and viewer with the aim of of being small, fast, \
+efficient, very functional and intuitive.
+"
+HOMEPAGE="https://github.com/HaikuArchives/Peek"
+SRC_URI="git+https://github.com/HaikuArchives/Peek.git#ce06fe5"
+REVISION="1"
+COPYRIGHT="2001 Durand John Miller"
+LICENSE="BSD (3-clause)"
+
+ARCHITECTURES="x86_gcc2"
+
+PROVIDES="
+	peek = $portVersion
+	app:Peek = $portVersion
+	"
+
+REQUIRES="
+	haiku >= $haikuVersion
+	"
+
+BUILD_PREREQUIRES="
+	makefile_engine
+	cmd:mkdepend
+	cmd:make
+	cmd:gcc
+	cmd:g++
+	"
+
+BUILD_REQUIRES="
+	haiku_devel >= $haikuVersion
+	"
+
+BUILD()
+{
+	cd source
+	make $jobArgs OBJ_DIR=objects
+}
+
+INSTALL()
+{
+	mkdir -p $appsDir/Peek
+	cp source/objects/Peek $appsDir/Peek/Peek
+	cp -r languages $appsDir/Peek/
+	addAppDeskbarSymlink $appsDir/Peek/Peek
+}
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/textsaver/textsaver-1.0.recipe b/haiku-apps/textsaver/textsaver-1.0.recipe
new file mode 100644
index 000000000..f02a03927
--- /dev/null
+++ b/haiku-apps/textsaver/textsaver-1.0.recipe
@@ -0,0 +1,52 @@
+SUMMARY="TextSaver screensaver"
+DESCRIPTION="Displays your text at random locations in random colors."
+HOMEPAGE="https://github.com/bbjimmy/TextSaver"
+SRC_URI="https://github.com/bbjimmy/TextSaver/archive/1.0.tar.gz"
+CHECKSUM_SHA256="00ecaba878786fce07620946124bdb42ec52e9d1c597cc2a876355229a786747"
+SOURCE_DIR="TextSaver-1.0"
+
+LICENSE="MIT"
+COPYRIGHT="2002 Marcus Overhagen
+ 2004-2013 Jim Saxton, FAT ELK SOFTWARE
+"
+
+REVISION="1"
+
+ARCHITECTURES="x86_gcc2 x86 ?x86_64"
+
+PROVIDES="
+	testsaver = $portVersion
+	app:textsaver = $portVersion
+	"
+
+REQUIRES="
+	haiku >= $haikuVersion"
+
+BUILD_REQUIRES="
+	haiku_devel >= $haikuVersion"
+
+BUILD_PREREQUIRES="
+	cmd:gcc
+	cmd:make
+	makefile_engine
+	"
+
+BUILD()
+{
+	cd source
+	make $jobArgs BUILDHOME=`finddir B_SYSTEM_DEVELOP_DIRECTORY`
+}
+
+INSTALL()
+{	
+	
+	mkdir -p $addOnsDir/Screen\ Savers
+	cd source
+	cp TextSaver $addOnsDir/Screen\ Savers/TextSaver
+	mkdir -p $dataDir/FatElk
+	cd ..
+	unzip -o fatelk
+	cp "FAT ELK" $dataDir/FatElk/
+	cp "Fat Elk" $dataDir/FatElk/
+		
+}