diff --git a/media-gfx/tuxpaint/patches/tuxpaint-0.9.22.patch b/media-gfx/tuxpaint/patches/tuxpaint-0.9.22.patchset
similarity index 62%
rename from media-gfx/tuxpaint/patches/tuxpaint-0.9.22.patch
rename to media-gfx/tuxpaint/patches/tuxpaint-0.9.22.patchset
index 2f2d7354b..7bb4f432e 100644
--- a/media-gfx/tuxpaint/patches/tuxpaint-0.9.22.patch
+++ b/media-gfx/tuxpaint/patches/tuxpaint-0.9.22.patchset
@@ -1,3 +1,9 @@
+From 4f7259db0df3f771f89cb34ec062a61c6dfcbb9c Mon Sep 17 00:00:00 2001
+From: Jerome Duval <jerome.duval@gmail.com>
+Date: Sat, 30 Aug 2014 20:51:07 +0000
+Subject: applying patch tuxpaint-0.9.22.patch
+
+
 diff --git a/src/fonts.c b/src/fonts.c
 index a81a2e6..b1e34aa 100644
 --- a/src/fonts.c
@@ -42,3 +48,30 @@ index 4df46be..2e2298e 100644
      if (*env_language)
        {
        env_language_lang = strtok(env_language, ":");
+-- 
+1.8.3.4
+
+
+From 7f502224dfd679b1e207e48a7f7ee35f7cb7b818 Mon Sep 17 00:00:00 2001
+From: Jerome Duval <jerome.duval@gmail.com>
+Date: Sat, 30 Aug 2014 21:07:09 +0000
+Subject: NOSVG seems broken
+
+
+diff --git a/src/tuxpaint.c b/src/tuxpaint.c
+index afa90ab..d1b824f 100644
+--- a/src/tuxpaint.c
++++ b/src/tuxpaint.c
+@@ -1939,8 +1939,8 @@ static SDL_Surface * load_kpx(char * file);
+ static SDL_Surface * load_svg(char * file);
+ static float pick_best_scape(unsigned int orig_w, unsigned int orig_h,
+                       unsigned int max_w, unsigned int max_h);
+-static SDL_Surface * myIMG_Load_RWops(char * file);
+ #endif
++static SDL_Surface * myIMG_Load_RWops(char * file);
+ static SDL_Surface * myIMG_Load(char * file);
+ static int trash(char * path);
+ int file_exists(char * path);
+-- 
+1.8.3.4
+
diff --git a/media-gfx/tuxpaint/tuxpaint-0.9.22.recipe b/media-gfx/tuxpaint/tuxpaint-0.9.22.recipe
index b3889c402..9a1b2b8c8 100644
--- a/media-gfx/tuxpaint/tuxpaint-0.9.22.recipe
+++ b/media-gfx/tuxpaint/tuxpaint-0.9.22.recipe
@@ -10,7 +10,9 @@ COPYRIGHT="2002-2010 Bill Kendrick and others"
 LICENSE="GNU GPL v2"
 REVISION="1"
 
-ARCHITECTURES="x86 x86_gcc2 ?x86_64"
+ARCHITECTURES="x86 x86_gcc2 x86_64"
+
+PATCHES="tuxpaint-$portVersion.patchset"
 
 PROVIDES="
 	tuxpaint = $portVersion
@@ -60,8 +62,6 @@ USER_SETTINGS_FILES="
 	settings/TuxPaint directory
 	"
 
-PATCHES="tuxpaint-0.9.22.patch"
-
 BUILD()
 {
 	make $jobArgs FRIBIDI_LIB=-lfribidi