diff --git a/app-dicts/mythes/mythes-1.2.4.recipe b/app-dicts/mythes/mythes-1.2.4.recipe
new file mode 100644
index 000000000..eb22a9f02
--- /dev/null
+++ b/app-dicts/mythes/mythes-1.2.4.recipe
@@ -0,0 +1,84 @@
+SUMMARY="A simple thesaurus"
+DESCRIPTION="MyThes is a simple thesaurus that used a structured text \
+data file and an index file with binary search to lookup words \
+and phrases and return information on part of speech, \
+meanings, and synonyms.
+
+- written in C++ to make it easier to interface with \
+LibreOffice, OpenOffice, AbiWord, Pspell, etc
+- it is stateless, uses no static variables and \
+should be completely reentrant with no ifdefs  
+- it compiles with -ansi and -pedantic and -Wall \
+with no warnigns so it shouldbe quite portable
+- it uses a simple perl program to read the structured \
+text file and create the index needed for binary \
+searching
+- it is very simple with *lots* of comments. \
+The main "smarts" are in the structure of the \
+text file that makes up the thesaurus data
+- It comes with a ready-to-go structured thesaurus \
+data file for en_US extracted from the WordNet-2.0 data.
+- Please see WordNet_license.txt and WordNet_readme.txt \
+for more information on the very useful project!
+- See http://www.danielnaber.de/wn2ooo/ for utilities to \
+regenerate an up to date English thesaurus from the most \
+recent WordNet data."
+HOMEPAGE="http://sourceforge.net/projects/hunspell/files/MyThes/1.2.4"
+SRC_URI="http://prdownloads.sf.net/hunspell/mythes-1.2.4.tar.gz"
+CHECKSUM_SHA256="1e81f395d8c851c3e4e75b568e20fa2fa549354e75ab397f9de4b0e0790a305f"
+COPYRIGHT="1994 - 2009 Free Software Foundation, Inc."
+LICENSE="BSD (2-clause)"
+REVISION="1"
+
+PROVIDES="
+	mythes$secondaryArchSuffix = $portVersion
+	cmd:mythes = $portVersion
+	cmd:th_gen_idx.pl
+	lib:libmythes_1.2$secondaryArchSuffix = $portVersion
+	"
+
+PROVIDES_devel="
+	devel:libmythes_1.2$secondaryArchSuffix = $portVersion
+	mythes${secondaryArchSuffix}_devel = $portVersion
+	"
+
+ARCHITECTURES="x86_gcc2"
+SECONDARY_ARCHITECTURES="x86"
+
+REQUIRES="
+	haiku$secondaryArchSuffix
+	lib:libhunspell_1.3$secondaryArchSuffix
+	cmd:perl
+	"
+
+REQUIRES_devel="
+	mythes$secondaryArchSuffix == $portVersion base
+	"
+
+BUILD_REQUIRES="
+	devel:libhunspell_1.3$secondaryArchSuffix
+	"
+
+BUILD_PREREQUIRES="
+	cmd:gcc$secondaryArchSuffix
+	cmd:make
+	cmd:pkg_config$secondaryArchSuffix
+	cmd:awk
+	haiku${secondaryArchSuffix}_devel
+	"
+
+BUILD()
+{
+	runConfigure ./configure
+	make $jobArgs
+}
+
+INSTALL()
+{
+	make install
+
+	prepareInstalledDevelLibs \
+		libmythes-1.2
+	packageEntries devel \
+		$developDir
+}
\ No newline at end of file
diff --git a/dev-vcs/subversion/patches/subversion-1.8.10.patchset b/dev-vcs/subversion/patches/subversion-1.8.11.patchset
similarity index 100%
rename from dev-vcs/subversion/patches/subversion-1.8.10.patchset
rename to dev-vcs/subversion/patches/subversion-1.8.11.patchset
diff --git a/dev-vcs/subversion/subversion-1.8.10.recipe b/dev-vcs/subversion/subversion-1.8.11.recipe
similarity index 97%
rename from dev-vcs/subversion/subversion-1.8.10.recipe
rename to dev-vcs/subversion/subversion-1.8.11.recipe
index 2d64dd0f5..aa05c4f6c 100644
--- a/dev-vcs/subversion/subversion-1.8.10.recipe
+++ b/dev-vcs/subversion/subversion-1.8.11.recipe
@@ -10,7 +10,7 @@ HOMEPAGE="http://subversion.apache.org"
 LICENSE="Apache-Subversion"
 COPYRIGHT="2010-2014 The Apache Software Foundation"
 SRC_URI="http://wwwftp.ciril.fr/pub/apache/subversion/subversion-$portVersion.tar.bz2"
-CHECKSUM_SHA256="1cc900c8a7974337c3ed389dc6b5c59012ec48c7d4107ae31fd7c929ded47dcc"
+CHECKSUM_SHA256="10b056420e1f194c12840368f6bf58842e6200f9cb8cc5ebbf9be2e89e56e4d9"
 REVISION="1"
 ARCHITECTURES="x86_gcc2 x86 x86_64"
 
@@ -81,7 +81,7 @@ USER_SETTINGS_FILES="
 	"
 
 
-PATCHES="subversion-1.8.10.patchset"
+PATCHES="subversion-$portVersion.patchset"
 
 BUILD()
 {
diff --git a/games-emulation/dgen/dgen-1.33.recipe b/games-emulation/dgen/dgen-1.33.recipe
index 9e5f00cae..619d0b82c 100644
--- a/games-emulation/dgen/dgen-1.33.recipe
+++ b/games-emulation/dgen/dgen-1.33.recipe
@@ -9,8 +9,7 @@ Genesis and Mega Drive systems. Features:
  * Screenshots, demos recording and playback"
 HOMEPAGE="http://dgen.sourceforge.net/"
 COPYRIGHT="1998-2014 tamentis & zamaz"
-SRC_URI="http://sourceforge.net/projects/dgen/files/dgen/$portVersion/dgen-sdl-$portVersion.tar.gz/download"
-SRC_FILENAME="dgen-sdl-$portVersion.tar.gz"
+SRC_URI="http://sourceforge.net/projects/dgen/files/dgen/$portVersion/dgen-sdl-$portVersion.tar.gz"
 CHECKSUM_SHA256="99e2c06017c22873c77f88186ebcc09867244eb6e042c763bb094b02b8def61e"
 SOURCE_DIR="dgen-sdl-$portVersion"
 REVISION="1"
diff --git a/haiku-apps/bafx/bafx-0.0.1.recipe b/haiku-apps/bafx/bafx-0.2.3.recipe
similarity index 60%
rename from haiku-apps/bafx/bafx-0.0.1.recipe
rename to haiku-apps/bafx/bafx-0.2.3.recipe
index 2070acb24..b3b8581b9 100644
--- a/haiku-apps/bafx/bafx-0.0.1.recipe
+++ b/haiku-apps/bafx/bafx-0.2.3.recipe
@@ -1,12 +1,13 @@
 SUMMARY="A file manager for Haiku."
-DESCRIPTION="
-BAfx is a file manager for Haiku.
-"
+DESCRIPTION="BAfx is a file manager for BeOS/Haiku. It uses a single window \
+with two panes for source and destination folder. \
+The file manager is still in early stages of development. \
+A built-in text and image viewer are planned for future releases."
 HOMEPAGE="https://github.com/marbocub/BAfx"
-SRC_URI="git+https://github.com/marbocub/BAfx#4b14a8ba4c"
+SRC_URI="git+https://github.com/marbocub/BAfx#ebd3db8a22"
 COPYRIGHT="2012 @marbocub"
 LICENSE="MIT"
-REVISION="2"
+REVISION="1"
 ARCHITECTURES="x86_gcc2 x86 ?x86_64"
 
 PROVIDES="
@@ -25,8 +26,6 @@ BUILD_PREREQUIRES="
 	cmd:mkdepend
 	"
 
-PATCHES="bafx-0.0.1.patchset"
-
 BUILD()
 {
 	make OBJ_DIR=objects \
diff --git a/haiku-apps/bafx/patches/bafx-0.0.1.patchset b/haiku-apps/bafx/patches/bafx-0.0.1.patchset
deleted file mode 100644
index f5c0c7ee4..000000000
--- a/haiku-apps/bafx/patches/bafx-0.0.1.patchset
+++ /dev/null
@@ -1,22 +0,0 @@
-From 7c5605074b639c6daa54275d1ced9720555da3d1 Mon Sep 17 00:00:00 2001
-From: Chris Roberts <cpr420@gmail.com>
-Date: Mon, 2 Dec 2013 17:37:11 -0700
-Subject: Fix makefile stdc++ libs
-
-
-diff --git a/Makefile b/Makefile
-index 6f14782..50893a9 100755
---- a/Makefile
-+++ b/Makefile
-@@ -56,7 +56,7 @@ RSRCS=
- #		naming scheme you need to specify the path to the library
- #		and it's name
- #		library: my_lib.a entry: my_lib.a or path/my_lib.a
--LIBS= be
-+LIBS= be $(STDCPPLIBS)
- 
- #	specify additional paths to directories following the standard
- #	libXXX.so or libXXX.a naming scheme.  You can specify full paths
--- 
-1.8.3.4
-
diff --git a/haiku-apps/beam/beam-1.2alpha.recipe b/haiku-apps/beam/beam-1.2alpha.recipe
index 86dc8d459..1fe158b50 100644
--- a/haiku-apps/beam/beam-1.2alpha.recipe
+++ b/haiku-apps/beam/beam-1.2alpha.recipe
@@ -1,7 +1,7 @@
 SUMMARY="An e-mail client." 
 HOMEPAGE="http://beam.sourceforge.net" 
 SRC_URI="git://beam.git.sourceforge.net/gitroot/beam/beam"
-REVISION="3"
+REVISION="4"
 ARCHITECTURES="x86_gcc2 x86"
 PROVIDES="
 	beam = $portVersion
diff --git a/haiku-apps/beam/patches/beam-1.2alpha.patchset b/haiku-apps/beam/patches/beam-1.2alpha.patchset
index 5ac3ffe2d..fbb9c2df8 100644
--- a/haiku-apps/beam/patches/beam-1.2alpha.patchset
+++ b/haiku-apps/beam/patches/beam-1.2alpha.patchset
@@ -1,4 +1,4 @@
-From 6545d15dfc53594f4141047bf4c84d55cfccda6d Mon Sep 17 00:00:00 2001
+From e6115845893578b237144c1660a686802598ff9a Mon Sep 17 00:00:00 2001
 From: Chris Roberts <cpr420@gmail.com>
 Date: Thu, 14 Nov 2013 02:12:56 -0700
 Subject: Adjust search path for libbnetapi
@@ -20,3 +20,29 @@ index d411b68..4874ac6 100644
 -- 
 1.8.3.4
 
+
+From 63db87fb177e6c1649bf0aad0aa1922af47dd59e Mon Sep 17 00:00:00 2001
+From: Adrien Destugues <pulkomandy@gmail.com>
+Date: Tue, 23 Dec 2014 10:18:56 +0100
+Subject: Remove leftover unlock.
+
+I can't find any place where the lock would be locked matching this call
+to Unlock. Must be an error then.
+
+Triggers #6400 on Haiku.
+
+diff --git a/src-beam/BmGuiRoster.cpp b/src-beam/BmGuiRoster.cpp
+index d16e0f1..cd4bf59 100644
+--- a/src-beam/BmGuiRoster.cpp
++++ b/src-beam/BmGuiRoster.cpp
+@@ -516,7 +516,6 @@ void BmGuiRoster::RebuildLogMenu( BmMenuControllerBase* logMenu) {
+ 		}
+ 		logMenu->AddItem( smtpMenu);
+ 	}
+-	TheLogHandler->mLocker.Unlock();
+ }
+ 
+ /*------------------------------------------------------------------------------*\
+-- 
+1.8.3.4
+
diff --git a/haiku-apps/binary_clock/binary_clock-2.0.recipe b/haiku-apps/binaryclock/binaryclock-20141223.recipe
similarity index 63%
rename from haiku-apps/binary_clock/binary_clock-2.0.recipe
rename to haiku-apps/binaryclock/binaryclock-20141223.recipe
index ef07650c9..a685cdd21 100644
--- a/haiku-apps/binary_clock/binary_clock-2.0.recipe
+++ b/haiku-apps/binaryclock/binaryclock-20141223.recipe
@@ -5,7 +5,7 @@ quite enjoyable to reprogram my brain to learn to read it at a glance. It just \
 takes a little getting used to.
 "
 HOMEPAGE="http://github.com/HaikuArchives/BinaryClock"
-SRC_URI="git://github.com/HaikuArchives/BinaryClock#5d04da1137"
+SRC_URI="git://github.com/HaikuArchives/BinaryClock#bfefbf7f93e7a07c841fdb1162e119b0364fee85"
 REVISION="2"
 LICENSE="GNU GPL v2"
 COPYRIGHT="2000 David Enderson"
@@ -13,7 +13,7 @@ COPYRIGHT="2000 David Enderson"
 ARCHITECTURES="x86_gcc2 !x86 !x86_64"
 
 PROVIDES="
-	binary_clock = $portVersion
+	binaryclock = $portVersion
 	app:BinaryClock = $portVersion	
 	"
 
@@ -26,26 +26,32 @@ BUILD_REQUIRES="
 	"
 
 BUILD_PREREQUIRES="
+	makefile_engine
 	cmd:make
 	cmd:gcc
 	cmd:ld
 	"
 
 USER_SETTINGS_FILES="
-	settings/BinaryClock_2.xx
+	settings/BinaryClock
 	"
 
 BUILD()
 {
 	cd Application
-	g++ -o BinaryClock *.cpp -lbe -ltranslation
-	xres -o BinaryClock BinaryClock.rsrc
-	mimeset -f BinaryClock
+	make $jobArgs OBJ_DIR=objects
+
+	cd ../Screensaver
+	make $jobArgs OBJ_DIR=objects
 }
 
 INSTALL()
 {
-	mkdir -p $appsDir	
-	cp Application/BinaryClock $appsDir
+	mkdir -p $appsDir
+	mkdir -p $addOnsDir/Screen\ Savers/
+
+	cp Application/objects/BinaryClock $appsDir
 	addAppDeskbarSymlink $appsDir/BinaryClock "Binary Clock"
+
+	cp Screensaver/objects/BinaryClock $addOnsDir/Screen\ Savers
 }
diff --git a/haiku-apps/fontboy/fontboy-0.9.7.recipe b/haiku-apps/fontboy/fontboy-0.9.7.recipe
index 77525b44d..f6d8a02dc 100644
--- a/haiku-apps/fontboy/fontboy-0.9.7.recipe
+++ b/haiku-apps/fontboy/fontboy-0.9.7.recipe
@@ -1,13 +1,12 @@
-SUMMARY="A small application to show your installed fonts in Haiku."
+SUMMARY="A small application to show your installed fonts"
 DESCRIPTION="
 Fontboy is a small application to show your installed fonts in Haiku. You can \
 get additional information of the selected font and a preview of the complete \
-Unicode charset. Fontboy allows you to adjust the appearence to your desired \
-needs and it's fast because Haiku is.
+Unicode charset.
 "
 HOMEPAGE="https://github.com/HaikuArchives/FontBoy"
-SRC_URI="git://github.com/HaikuArchives/FontBoy.git#2195924e69096a5e7a9774cfaec8fdc277045ecf"
-REVISION="1"
+SRC_URI="git://github.com/HaikuArchives/FontBoy.git#37177cb9f816f112954a04ddc6f99abd2d608326"
+REVISION="2"
 LICENSE="FontBoy"
 COPYRIGHT="1999-2003 Oliver 'Madison' Kohl"
 
diff --git a/haiku-apps/snapshot/snapshot-1.0.recipe b/haiku-apps/snapshot/snapshot-1.0.recipe
new file mode 100644
index 000000000..d04396364
--- /dev/null
+++ b/haiku-apps/snapshot/snapshot-1.0.recipe
@@ -0,0 +1,43 @@
+SUMMARY="Tracker add-on to take snapshots of files or folders" 
+DESCRIPTION="This Tracker add-on lets you take snapshots of a folder, saving it \
+as zip file, with a timestamp, to a preset folder. Snapshots are \
+currently saved to /boot/home/Snapshots"
+HOMEPAGE="https://github.com/HaikuArchives/SnapShot"
+SRC_URI="git+https://github.com/HaikuArchives/Snapshot#9ba592336a0d54707b7e5983dce93f8958b61d37
+LICENSE="BSD (3-clause)"
+COPYRIGHT="2000 Jonas Sundström"
+
+USER_SETTINGS_FILES="settings/Kirilla/Snapshot/settings"
+
+ARCHITECTURES="x86_gcc2"
+
+PROVIDES=" 
+	snapshot = $portVersion
+	addon:snapshot = $portVersion 
+	"
+
+REQUIRES="
+	haiku 
+	"
+		
+BUILD_REQUIRES="
+	haiku_devel 
+	"
+	
+BUILD_PREREQUIRES="
+	makefile_engine
+	cmd:gcc
+	cmd:mkdepend
+	"
+
+BUILD()
+{
+	cd Source        
+	make $jobArgs OBJ_DIR=objects
+}
+
+INSTALL()
+{
+	mkdir -p $addOnsDir/Tracker
+	cp -a Source/objects/Snapshot $addOnsDir/Tracker
+}
diff --git a/haiku-apps/takenotes/takenotes-1.0.0.recipe b/haiku-apps/takenotes/takenotes-1.0.0.recipe
index c00265afc..05df96c52 100644
--- a/haiku-apps/takenotes/takenotes-1.0.0.recipe
+++ b/haiku-apps/takenotes/takenotes-1.0.0.recipe
@@ -1,6 +1,6 @@
 SUMMARY="A note taking application"
 DESCRIPTION="
-With this application you can:
+With TakeNotes you can:
 - Write a note
 - Edit the font family, color and size
 - Change the color of your note
@@ -12,9 +12,10 @@ With this application you can:
 COPYRIGHT="Copyright 2009, Ilio Catallo, Stefano Celentano, Eleonora Ciceri, all rights reserved"
 LICENSE="GNU GPL v2"
 HOMEPAGE="https://github.com/HaikuArchives/TakeNotes"
-SRC_URI="git+https://github.com/HaikuArchives/TakeNotes#3ee7d80b53"
-REVISION="2"
+SRC_URI="git+https://github.com/HaikuArchives/TakeNotes#7f84d8f50e"
+REVISION="3"
 ARCHITECTURES="x86_gcc2 x86 ?x86_64"
+SOURCE_DIR="takesnotes-1.0.0/source"
 
 PROVIDES="
 	takenotes=$portVersion
@@ -36,8 +37,6 @@ BUILD_PREREQUIRES="
 	cmd:mkdepend
 	"
 
-PATCHES="takenotes-1.0.0.patchset"
-
 BUILD()
 {
 	make OBJ_DIR=objects \
@@ -49,4 +48,4 @@ INSTALL()
 	mkdir -p $appsDir
 	cp objects/TakeNotes $appsDir
 	addAppDeskbarSymlink $appsDir/TakeNotes
-}
+}
\ No newline at end of file
diff --git a/haiku-apps/tolmach/tolmach-1.1.0.recipe b/haiku-apps/tolmach/tolmach-1.1.0.recipe
index d50ee56fe..089e2ccee 100644
--- a/haiku-apps/tolmach/tolmach-1.1.0.recipe
+++ b/haiku-apps/tolmach/tolmach-1.1.0.recipe
@@ -9,48 +9,44 @@ LICENSE="GNU GPL v2"
 HOMEPAGE="https://gitorious.org/desknotes/tolmach"
 SRC_URI="git+http://github.com/haikuarchives/tolmach.git#5a67e9d38292d5dd482e116e8ee7aa605dee5398"
 REVISION="1"
- 
+
 ARCHITECTURES="x86_gcc2 x86 ?x86_64"
- 
+
 PROVIDES="
-        tolmach = $portVersion
-        app:Tolmach = $portVersion
-        lib:libfSub
-        "
- 
+	tolmach = $portVersion
+	app:Tolmach = $portVersion
+	lib:libfSub
+	"
+
 REQUIRES="
-        haiku
-        "
- 
+	haiku
+	"
+
 BUILD_REQUIRES="
-        haiku_devel
-        "
- 
+	haiku_devel
+	"
+
 BUILD_PREREQUIRES="
-        makefile_engine
-        cmd:gcc
-        cmd:make
-        cmd:mkdepend
-        "
- 
+	makefile_engine
+	cmd:gcc
+	cmd:make
+	cmd:mkdepend
+	"
+
 USER_SETTINGS_FILES="
-        settings/Tolmach_Preferences directory"
- 
+	settings/Tolmach_Preferences directory"
+
 BUILD()
 {
-        make BUILDHOME=`finddir B_SYSTEM_DEVELOP_DIRECTORY`
+	make BUILDHOME=`finddir B_SYSTEM_DEVELOP_DIRECTORY` OBJ_DIR=objects
 }
- 
+
 INSTALL()
 {
-        architecture=`echo $buildArchitecture | sed 's/_/-/g'`
-       
-        mkdir -p $appsDir/Tolmach $dataDir/Tolmach
-       
-        cd objects.$architecture-release
-        cp Tolmach $appsDir/Tolmach
-        addAppDeskbarSymlink $appsDir/Tolmach/Tolmach
-       
-        cd ../Dictionaries
-        cp *.pgb $dataDir/Tolmach
-}
\ No newline at end of file
+	mkdir -p $appsDir $dataDir/Tolmach
+
+	cp objects/Tolmach $appsDir
+	cp Dictionaries/*.pgb $dataDir/Tolmach
+
+	addAppDeskbarSymlink $appsDir/Tolmach/Tolmach
+}
diff --git a/media-libs/libpng/libpng-1.5.20.recipe b/media-libs/libpng/libpng-1.5.21.recipe
similarity index 83%
rename from media-libs/libpng/libpng-1.5.20.recipe
rename to media-libs/libpng/libpng-1.5.21.recipe
index a47415858..2c9db48c5 100644
--- a/media-libs/libpng/libpng-1.5.20.recipe
+++ b/media-libs/libpng/libpng-1.5.21.recipe
@@ -11,15 +11,15 @@ COPYRIGHT="
 	"
 LICENSE="LibPNG"
 SRC_URI="http://prdownloads.sourceforge.net/libpng/libpng-$portVersion.tar.gz"
-CHECKSUM_SHA256="ca16b85feea75604d6ee2072486afe3fb52d867b4105e0bc60dbea78b4bc2ee0"
+CHECKSUM_SHA256="835ce1d42ea9f50eddf74754f2b06b1c0f7a1d8e46deb89b839a5ca018599793"
 REVISION="1"
 ARCHITECTURES="x86_gcc2 x86 x86_64"
 SECONDARY_ARCHITECTURES="x86_gcc2 x86"
 
 PROVIDES="
 	libpng$secondaryArchSuffix = $portVersion compat >= 1.5
-	lib:libpng$secondaryArchSuffix = 15.20.0 compat >= 15
-	lib:libpng15$secondaryArchSuffix = 15.20.0 compat >= 15
+	lib:libpng$secondaryArchSuffix = 15.21.0 compat >= 15
+	lib:libpng15$secondaryArchSuffix = 15.21.0 compat >= 15
 	"
 REQUIRES="
 	haiku$secondaryArchSuffix
@@ -70,8 +70,8 @@ PROVIDES_devel="
 	libpng${secondaryArchSuffix}_devel = $portVersion compat >= 1.5
 	cmd:libpng_config$secondaryArchSuffix = $portVersion compat >= 1.5
 	cmd:libpng15_config$secondaryArchSuffix = $portVersion compat >= 1.5
-	devel:libpng$secondaryArchSuffix = 15.20.0 compat >= 15
-	devel:libpng15$secondaryArchSuffix = 15.20.0 compat >= 15
+	devel:libpng$secondaryArchSuffix = 15.21.0 compat >= 15
+	devel:libpng15$secondaryArchSuffix = 15.21.0 compat >= 15
 	"
 REQUIRES_devel="
 	libpng$secondaryArchSuffix == $portVersion base
diff --git a/media-libs/libpng/libpng12-1.2.51.recipe b/media-libs/libpng/libpng12-1.2.52.recipe
similarity index 79%
rename from media-libs/libpng/libpng12-1.2.51.recipe
rename to media-libs/libpng/libpng12-1.2.52.recipe
index 8406b6ca9..6fb3d3cc6 100644
--- a/media-libs/libpng/libpng12-1.2.51.recipe
+++ b/media-libs/libpng/libpng12-1.2.52.recipe
@@ -13,17 +13,17 @@ COPYRIGHT="
 	1995-1996 Guy Eric Schalnat, Group 42, Inc.
 	"
 LICENSE="LibPNG"
-SRC_URI="http://sourceforge.net/projects/libpng/files/libpng12/1.2.51/libpng-1.2.51.tar.bz2"
-CHECKSUM_SHA256="b0ad409d7048c851eadb2abab6c1a1a1e131bc4d3d07501ff7c820cce5bec811"
-SOURCE_DIR="libpng-1.2.51"
+SRC_URI="http://sourceforge.net/projects/libpng/files/libpng12/$portVersion/libpng-$portVersion.tar.bz2"
+CHECKSUM_SHA256="e90ede6d543152e68c08c91c45f39565185ac7eb8cb2b5d058a196050ab04229"
+SOURCE_DIR="libpng-$portVersion"
 REVISION="1"
 ARCHITECTURES="x86_gcc2"
 SECONDARY_ARCHITECTURES="x86_gcc2"
 
 PROVIDES="
 	libpng12$secondaryArchSuffix = $portVersion compat >= 1.2
-	lib:libpng$secondaryArchSuffix = 3.51.0 compat >= 3
-	lib:libpng12$secondaryArchSuffix = 3.51.0 compat >= 3
+	lib:libpng$secondaryArchSuffix = 3.52.0 compat >= 3
+	lib:libpng12$secondaryArchSuffix = 3.52.0 compat >= 3
 	"
 REQUIRES="
 	haiku$secondaryArchSuffix
@@ -72,8 +72,8 @@ PROVIDES_devel="
 	libpng12${secondaryArchSuffix}_devel = $portVersion compat >= 1.2
 	cmd:libpng_config$secondaryArchSuffix = $portVersion compat >= 1.2
 	cmd:libpng12_config$secondaryArchSuffix = $portVersion compat >= 1.2
-	devel:libpng$secondaryArchSuffix = 3.51.0 compat >= 3
-	devel:libpng12$secondaryArchSuffix = 3.51.0 compat >= 3
+	devel:libpng$secondaryArchSuffix = 3.52.0 compat >= 3
+	devel:libpng12$secondaryArchSuffix = 3.52.0 compat >= 3
 	"
 REQUIRES_devel="
 	libpng12$secondaryArchSuffix == $portVersion base
diff --git a/media-libs/libpng/libpng16-1.6.15.recipe b/media-libs/libpng/libpng16-1.6.16.recipe
similarity index 85%
rename from media-libs/libpng/libpng16-1.6.15.recipe
rename to media-libs/libpng/libpng16-1.6.16.recipe
index 39fde2cdc..db5882161 100644
--- a/media-libs/libpng/libpng16-1.6.15.recipe
+++ b/media-libs/libpng/libpng16-1.6.16.recipe
@@ -11,7 +11,7 @@ COPYRIGHT="
 	"
 LICENSE="LibPNG"
 SRC_URI="http://prdownloads.sourceforge.net/libpng/libpng-$portVersion.tar.gz"
-CHECKSUM_SHA256="dc4f90ff3ba4559b5eb653da9058e3d862d5e8162fe2612f9339a6f6d2a2139d"
+CHECKSUM_SHA256="02f96b6bad5a381d36d7ba7a5d9be3b06f7fe6c274da00707509c23592a073ad"
 SOURCE_DIR="libpng-$portVersion"
 REVISION="1"
 ARCHITECTURES="x86_gcc2 x86 x86_64 arm"
@@ -19,8 +19,8 @@ SECONDARY_ARCHITECTURES="x86_gcc2 x86"
 
 PROVIDES="
 	libpng16$secondaryArchSuffix = $portVersion compat >= 1.6
-	lib:libpng$secondaryArchSuffix = 16.15.0 compat >= 16
-	lib:libpng16$secondaryArchSuffix = 16.15.0 compat >= 16
+	lib:libpng$secondaryArchSuffix = 16.16.0 compat >= 16
+	lib:libpng16$secondaryArchSuffix = 16.16.0 compat >= 16
 	"
 REQUIRES="
 	haiku$secondaryArchSuffix
@@ -69,8 +69,8 @@ PROVIDES_devel="
 	cmd:libpng16_config$secondaryArchSuffix = $portVersion compat >= 1.6
 	cmd:pngfix$secondaryArchSuffix = $portVersion compat >= 1.6
 	cmd:png_fix_itxt$secondaryArchSuffix = $portVersion compat >= 1.6
-	devel:libpng$secondaryArchSuffix = 16.15.0 compat >= 16
-	devel:libpng16$secondaryArchSuffix = 16.15.0 compat >= 16
+	devel:libpng$secondaryArchSuffix = 16.16.0 compat >= 16
+	devel:libpng16$secondaryArchSuffix = 16.16.0 compat >= 16
 	"
 REQUIRES_devel="
 	libpng16$secondaryArchSuffix == $portVersion base
diff --git a/net-libs/librsync/librsync-1.0.0pre.recipe b/net-libs/librsync/librsync-1.0.0.recipe
similarity index 61%
rename from net-libs/librsync/librsync-1.0.0pre.recipe
rename to net-libs/librsync/librsync-1.0.0.recipe
index f50168be7..6d132d571 100644
--- a/net-libs/librsync/librsync-1.0.0pre.recipe
+++ b/net-libs/librsync/librsync-1.0.0.recipe
@@ -7,10 +7,20 @@ design similar to that of zlib with the aim of allowing it to be embedded \
 into many different applications."
 
 HOMEPAGE="http://librsync.sourcefrog.net"
-GIT_HASH='ad8d065bfd'
-SRC_URI="git://github.com/librsync/librsync.git#$GIT_HASH"
-#CHECKSUM_SHA256=""
+
+# Unfortunately the maintainer of librsync did not publish a tag or released
+# tarball for the 1.0.0 release (yet?). Use a static tarball with Git hash
+# for now (which comparing to directly cloning allows for double-checking
+# correctness of the source).
+GIT_HASH='02f1cc19182845d37cfb6a893f54af220a294ce7'
+# Attach the $GIT_HASH to the file name just in case upstream publishes an
+# official release tarball.
+SRC_FILENAME="librsync-${portVersion}-${GIT_HASH}.tar.gz"
+SRC_URI="https://github.com/librsync/librsync/archive/${GIT_HASH}.tar.gz"
+CHECKSUM_SHA256='25d046a8cbc6e075cc68925b5070c1f0e731e3a018446f6bda20ec9723a5631a'
 REVISION="1"
+SOURCE_DIR="librsync-${GIT_HASH}"
+
 ARCHITECTURES="x86_gcc2 x86 x86_64"
 SECONDARY_ARCHITECTURES="x86_gcc2 x86"
 LICENSE="GNU LGPL v2.1"
@@ -23,16 +33,12 @@ COPYRIGHT="1995 Patrick Powell <papowell@astart.com>
 
 REQUIRES="
 	haiku$secondaryArchSuffix
-	lib:libbz2$secondaryArchSuffix
 	lib:libpopt$secondaryArchSuffix
-	lib:libz$secondaryArchSuffix
 "
 
 BUILD_REQUIRES="
 	haiku${secondaryArchSuffix}_devel
-	devel:libbz2$secondaryArchSuffix
 	devel:libpopt$secondaryArchSuffix
-	devel:libz$secondaryArchSuffix
 "
 
 BUILD_PREREQUIRES="
@@ -53,17 +59,13 @@ BUILD_PREREQUIRES="
 PROVIDES="
 	$portName                        = $portVersion
 	cmd:rdiff$secondaryArchSuffix    = $portVersion
-	lib:librsync$secondaryArchSuffix = 1.0.2 compat >= 1
+	lib:librsync$secondaryArchSuffix = 2.0.0 compat >= 2
 "
 
-PATCH()
-{
-	sed -i 's/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/g' configure.ac
-}
+PATCHES="librsync-${portVersion}.patchset"
 
 BUILD()
 {
-	mkdir -p m4
 	autoreconf -fi
 	runConfigure ./configure \
 		--enable-shared
@@ -84,9 +86,11 @@ TEST()
 	make check
 }
 
+# Although the librsync soname is bumped to 2.0.0, it is purely an ABI change,
+# so the compat level for the devel package remains at 1.
 PROVIDES_devel="
-	${portName}_devel = $portVersion
-	devel:librsync$secondaryArchSuffix = 1.0.2 compat >= 1
+	${portName}_devel           = $portVersion compat >= 1
+	devel:librsync$secondaryArchSuffix = 2.0.0 compat >= 1
 	"
 REQUIRES_devel="
 	librsync$secondaryArchSuffix == $portVersion base
diff --git a/net-libs/librsync/patches/librsync-1.0.0.patchset b/net-libs/librsync/patches/librsync-1.0.0.patchset
new file mode 100644
index 000000000..70a04f5bd
--- /dev/null
+++ b/net-libs/librsync/patches/librsync-1.0.0.patchset
@@ -0,0 +1,28 @@
+From 6fdcdff86e215e06817462c0fe4d63a0ca64cf21 Mon Sep 17 00:00:00 2001
+From: Timothy Gu <timothygu99@gmail.com>
+Date: Tue, 23 Dec 2014 06:15:47 +0000
+Subject: blake2b: Separate declaration and code
+
+Fixes old compilers like gcc 2.95.3.
+
+Signed-off-by: Timothy Gu <timothygu99@gmail.com>
+
+diff --git a/blake2b-ref.c b/blake2b-ref.c
+index bcf81da..43cf4c1 100644
+--- a/blake2b-ref.c
++++ b/blake2b-ref.c
+@@ -149,10 +149,10 @@ static inline int blake2b_init0( blake2b_state *S )
+ /* init xors IV with input parameter block */
+ int blake2b_init_param( blake2b_state *S, const blake2b_param *P )
+ {
+-  blake2b_init0( S );
+   uint8_t *p = ( uint8_t * )( P );
+   size_t i;
+ 
++  blake2b_init0( S );
+   /* IV XOR ParamBlock */
+   for( i = 0; i < 8; ++i )
+     S->h[i] ^= load64( p + sizeof( S->h[i] ) * i );
+-- 
+1.8.3.4
+