diff --git a/haiku-apps/wonderbrush/wonderbrush-2.1.2.recipe b/haiku-apps/wonderbrush/wonderbrush-2.1.2.recipe
index ac5958aed..781b257bb 100644
--- a/haiku-apps/wonderbrush/wonderbrush-2.1.2.recipe
+++ b/haiku-apps/wonderbrush/wonderbrush-2.1.2.recipe
@@ -1,11 +1,10 @@
 SUMMARY="Native editor for bitmap graphics"
-DESCRIPTION="
-WonderBrush is an editor for bitmap graphics. The main window holds any number \
-of documents, which are called Canvas. A canvas has an associated name and \
-pixel resolution as well as some other properties. It also references up to \
-two files, which represent it on disk, one is a file in some export format \
-(ie. an SVG document, a flat Translator bitmap or soure code), the other a \
-full-featured project file.
+DESCRIPTION="WonderBrush is an editor for bitmap graphics. The main window \
+holds any number of documents, which are called Canvas. A canvas has an \
+associated name and pixel resolution as well as some other properties. \
+It also references up to two files, which represent it on disk, one is a file \
+in some export format (ie. an SVG document, a flat Translator bitmap or soure \
+code), the other a full-featured project file.
 Each canvas can have any number of Layers, currently arranged as a list. Each \
 layer represents an individual bitmap in the size of the canvas. Depending on \
 each layers blending mode, they are composed on top of each other to form the \
@@ -17,62 +16,56 @@ At any time, it is possible to reorder the layers, or the objects they \
 contain. This could be called non-linear editing. It is also possible to \
 change most of an objects properties later on. This could be called \
 non-destructive editing, because adding another object (like a filter) does \
-not actually destroy any pixel data.
-"
+not actually destroy any pixel data."
 HOMEPAGE="http://yellowbites.com/wonderbrush.html"
-COPYRIGHT="2005, Stephan Aßmus und Ingo Weinhold GbR"
+COPYRIGHT="2005-2019, Stephan Aßmus und Ingo Weinhold GbR"
 LICENSE="WonderBrush"
-REVISION="5"
-SOURCE_URI="http://yellowbites.com/downloads/WonderBrush-2.1.2-x86-gcc2-2013-01-02.zip#noarchive"
-CHECKSUM_SHA256="d0e9fad818c3f7900a475b80a249c9aa4eb118dc8498a6370a87e7a10fa42067"
-SOURCE_DIR="WonderBrush"
+REVISION="6"
+srcGitRev="0313cf0421fa8a576471b83f0ebef7026f5b1fa0"
+SOURCE_URI="https://github.com/stippi/WonderBrush-v2/archive/$srcGitRev.tar.gz"
+CHECKSUM_SHA256="961316483e129143172bc3f5fa58fa3e08e44d24ce7390939aab30a64dfb6051"
+SOURCE_DIR="WonderBrush-v2-$srcGitRev"
+PATCHES="wonderbrush-$portVersion.patchset"
 
-ARCHITECTURES="x86_gcc2 !x86"
-SECONDARY_ARCHITECTURES="x86_gcc2"
-DISABLE_SOURCE_PACKAGE="yes"
+ARCHITECTURES="x86_gcc2 x86_64"
 
 USER_SETTINGS_FILES="
 	settings/WonderBrush directory
 	"
 
 PROVIDES="
-	wonderbrush$secondaryArchSuffix = $portVersion compat >= 2
+	wonderbrush = $portVersion compat >= 2
 	app:WonderBrush = $portVersion compat >= 2
 	"
 REQUIRES="
-	haiku$secondaryArchSuffix >= r1~alpha3_pm-1
-	lib:libfreetype$secondaryArchSuffix >= 6
-	lib:liblayout$secondaryArchSuffix
-	lib:libz$secondaryArchSuffix >= 1
+	haiku
+	lib:libexpat
+	lib:libfreetype
+	lib:liblayout
+	lib:libz
 	"
 
 BUILD_REQUIRES="
+	haiku_devel
+	devel:libexpat
+	devel:libfreetype
+	devel:liblayout
 	"
 BUILD_PREREQUIRES="
-	haiku$secondaryArchSuffix
-	coreutils
-	cmd:unzip
+	haiku
+	cmd:gcc
+	cmd:jam
 	"
 
 BUILD()
 {
-	:
+	# multi-job builds don't work reliably
+	jam
 }
 
 INSTALL()
 {
-	wonderbrushDir=$appsDir/WonderBrush
 	mkdir -p $appsDir
-	unzip -d $appsDir WonderBrush-2.1.2-x86-gcc2-2013-01-02.zip
-
-	rm -f $wonderbrushDir/lib/liblayout.so
-
-	# Hack to make libfreetype and libz available under the name WonderBrush
-	# has been linked against them.
-	ln -s $portPackageLinksDir/lib~libfreetype$secondaryArchSuffix/lib/libfreetype.so.6 \
-		$wonderbrushDir/lib/libfreetype.so
-	ln -s $portPackageLinksDir/lib~libz$secondaryArchSuffix/lib/libz.so.1 \
-		$wonderbrushDir/lib/libz.so
-
-	addAppDeskbarSymlink $wonderbrushDir/WonderBrush
+	cp WonderBrush/WonderBrush $appsDir
+	addAppDeskbarSymlink $appsDir/WonderBrush
 }