diff --git a/media-gfx/tuxpaint/patches/tuxpaint-0.9.22.patchset b/media-gfx/tuxpaint/patches/tuxpaint-0.9.22.patchset
index 7bb4f432e..a15e4ffaa 100644
--- a/media-gfx/tuxpaint/patches/tuxpaint-0.9.22.patchset
+++ b/media-gfx/tuxpaint/patches/tuxpaint-0.9.22.patchset
@@ -75,3 +75,23 @@ index afa90ab..d1b824f 100644
 -- 
 1.8.3.4
 
+--- tuxpaint-0.9.22/Makefile.org	2014-08-31 23:27:39.228327424 +0200
++++ tuxpaint-0.9.22/Makefile	2014-08-31 23:08:38.221773824 +0200
+@@ -108,7 +108,7 @@
+ windows_PREFIX:=/usr/local
+ osx_PREFIX:=/usr/local
+ 
+-beos_PREFIX=$(shell finddir B_APPS_DIRECTORY)/TuxPaint
++#beos_PREFIX=$(shell finddir B_APPS_DIRECTORY)/TuxPaint
+ linux_PREFIX:=/usr/local
+ PREFIX:=$($(OS)_PREFIX)
+ 
+@@ -434,7 +434,7 @@
+ 
+ windows_ARCH_INSTALL:=
+ osx_ARCH_INSTALL:=
+-beos_ARCH_INSTALL:=install-haiku
++#beos_ARCH_INSTALL:=install-haiku
+ linux_ARCH_INSTALL:=install-gnome install-kde install-kde-icons
+ ARCH_INSTALL:=$($(OS)_ARCH_INSTALL)
+ 
diff --git a/media-gfx/tuxpaint/tuxpaint-0.9.22.recipe b/media-gfx/tuxpaint/tuxpaint-0.9.22.recipe
index 9a1b2b8c8..93c4e3985 100644
--- a/media-gfx/tuxpaint/tuxpaint-0.9.22.recipe
+++ b/media-gfx/tuxpaint/tuxpaint-0.9.22.recipe
@@ -1,9 +1,12 @@
 SUMMARY="Drawing program designed for young children"
 DESCRIPTION="
-Tux Paint is a free, award-winning drawing program for children ages 3 to 12 (for example, preschool and K-6). Tux Paint is used in schools and around the world as a computer literacy drawing activity.  It combines an easy-to-use interface, fun sound effects, and an encouraging cartoon mascot who guides children as they use the program.
+Tux Paint is a free, award-winning drawing program for children \
+ages 3 to 12 (for example, preschool and K-6). Tux Paint is used \
+in schools and around the world as a computer literacy drawing activity. \
+It combines an easy-to-use interface, fun sound effects, and an \
+encouraging cartoon mascot who guides children as they use the program.
 "
 HOMEPAGE="http://www.tuxpaint.org/" 
-#SRC_URI="cvs://:pserver:anonymous@tuxpaint.cvs.sourceforge.net:/cvsroot/tuxpaint/tuxpaint"
 SRC_URI="http://sourceforge.net/projects/tuxpaint/files/tuxpaint/0.9.22/tuxpaint-0.9.22.tar.gz"
 CHECKSUM_SHA256="8abd932f8e36fad795bba0290c094c9c221e424c4b9aa8c763b7fb3459cb2be3"
 COPYRIGHT="2002-2010 Bill Kendrick and others"
@@ -20,33 +23,29 @@ PROVIDES="
 
 REQUIRES="
 	haiku
-	lib:libpaper
-	lib:libsdl
+	lib:libfribidi
+	lib:libiconv
 	lib:libintl
+	lib:libpaper
+	lib:libpng
+	lib:libsdl
 	lib:libSDL_ttf
 	lib:libSDL_image
 	lib:libSDL_mixer
-	lib:libfribidi
-	lib:freetype
-	lib:gettext
-	lib:libpng
-	lib:libiconv
 	lib:libz
 	"
 
 BUILD_REQUIRES="
-	devel:libsdl
+	devel:libfribidi
+	devel:libiconv
 	devel:libintl
 	devel:libpaper
+	devel:libpng
+	devel:libsdl
 	devel:libSDL_ttf
 	devel:libSDL_image
 	devel:libSDL_mixer
-	devel:libfribidi
-#	devel:freetype
-#	devel:gettext
-	devel:libpng
 	devel:libz
-	devel:libiconv
 	"
 
 BUILD_PREREQUIRES="
@@ -58,23 +57,21 @@ BUILD_PREREQUIRES="
 	cmd:ld
 	"
 
-USER_SETTINGS_FILES="
+USER_SETTING_FILES="
 	settings/TuxPaint directory
 	"
 
 BUILD()
 {
-	make $jobArgs FRIBIDI_LIB=-lfribidi
+	make $jobArgs FRIBIDI_LIB=-lfribidi PREFIX=$appsDir/TuxPaint
 }
 
 INSTALL()
 {
-	tuxpaintDir=$appsDir/TuxPaint
-	mkdir -p $tuxpaintDir
+	mkdir -p $appsDir/TuxPaint
 	
-	cp tuxpaint $tuxpaintDir/TuxPaint
-
-#	make install
-
-	#TODO Get TuxPaint put where we want it and create the settings folder, etc.
+	make install DESTDIR=$appsDir/TuxPaint
+	ln -s $appsDir/TuxPaint/bin/tuxpaint $appsDir/TuxPaint/TuxPaint
+	
+	addAppDeskbarSymlink $appsDir/TuxPaint/bin/tuxpaint TuxPaint
 }