diff --git a/media-gfx/tuxpaint/patches/tuxpaint-0.9.22.patch b/media-gfx/tuxpaint/patches/tuxpaint-0.9.22.patch
new file mode 100644
index 000000000..2f2d7354b
--- /dev/null
+++ b/media-gfx/tuxpaint/patches/tuxpaint-0.9.22.patch
@@ -0,0 +1,44 @@
+diff --git a/src/fonts.c b/src/fonts.c
+index a81a2e6..b1e34aa 100644
+--- a/src/fonts.c
++++ b/src/fonts.c
+@@ -966,10 +966,12 @@ static void loadfonts(SDL_Surface * screen, const char *const dir)
+        status_t result;
+     result = find_directory(B_SYSTEM_FONTS_DIRECTORY, volume, false, buffer, sizeof(buffer));
+        loadfonts(screen, buffer);
+-    result = find_directory(B_COMMON_FONTS_DIRECTORY, volume, false, buffer, sizeof(buffer));
++    result = find_directory(B_SYSTEM_NONPACKAGED_FONTS_DIRECTORY, volume, false, buffer, sizeof(buffer));
+        loadfonts(screen, buffer);
+     result = find_directory(B_USER_FONTS_DIRECTORY, volume, false, buffer, sizeof(buffer));
+        loadfonts(screen, buffer);
++    result = find_directory(B_USER_NONPACKAGED_FONTS_DIRECTORY, volume, false, buffer, sizeof(buffer));
++       loadfonts(screen, buffer);
+ #elif defined(__APPLE__)
+     loadfonts(screen, "/System/Library/Fonts");
+     loadfonts(screen, "/Library/Fonts");
+diff --git a/src/i18n.c b/src/i18n.c
+index 4df46be..2e2298e 100644
+--- a/src/i18n.c
++++ b/src/i18n.c
+@@ -880,10 +880,11 @@ static int set_current_language(const char *restrict locale_choice) MUST_CHECK;
+ static int set_current_language(const char *restrict loc)
+ {
+   int i;
++  int j = 0;
+   int y_nudge = 0;
+   char * oldloc;
+   char *env_language;
+-
++  char *env_language_lang;
+ 
+   if (strlen(loc) > 0)
+   {
+@@ -974,8 +975,6 @@ printf ("Locale AFTER is: %s\n", setlocale(LC_ALL,NULL));//EP
+       mysetenv("LANGUAGE", "C");
+   }
+     env_language = strdup(getenv("LANGUAGE"));
+-    int j = 0;
+-    char *env_language_lang;
+     if (*env_language)
+       {
+       env_language_lang = strtok(env_language, ":");
diff --git a/media-gfx/tuxpaint/tuxpaint-0.9.22.recipe b/media-gfx/tuxpaint/tuxpaint-0.9.22.recipe
new file mode 100644
index 000000000..b3889c402
--- /dev/null
+++ b/media-gfx/tuxpaint/tuxpaint-0.9.22.recipe
@@ -0,0 +1,80 @@
+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.
+"
+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"
+LICENSE="GNU GPL v2"
+REVISION="1"
+
+ARCHITECTURES="x86 x86_gcc2 ?x86_64"
+
+PROVIDES="
+	tuxpaint = $portVersion
+	"
+
+REQUIRES="
+	haiku
+	lib:libpaper
+	lib:libsdl
+	lib:libintl
+	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:libintl
+	devel:libpaper
+	devel:libSDL_ttf
+	devel:libSDL_image
+	devel:libSDL_mixer
+	devel:libfribidi
+#	devel:freetype
+#	devel:gettext
+	devel:libpng
+	devel:libz
+	devel:libiconv
+	"
+
+BUILD_PREREQUIRES="
+	haiku_devel
+	cmd:make
+	cmd:gcc
+	cmd:gperf
+	cmd:pkg_config
+	cmd:ld
+	"
+
+USER_SETTINGS_FILES="
+	settings/TuxPaint directory
+	"
+
+PATCHES="tuxpaint-0.9.22.patch"
+
+BUILD()
+{
+	make $jobArgs FRIBIDI_LIB=-lfribidi
+}
+
+INSTALL()
+{
+	tuxpaintDir=$appsDir/TuxPaint
+	mkdir -p $tuxpaintDir
+	
+	cp tuxpaint $tuxpaintDir/TuxPaint
+
+#	make install
+
+	#TODO Get TuxPaint put where we want it and create the settings folder, etc.
+}