diff --git a/games-engines/ponscripter/patches/ponscripter_x86-20111009.patchset b/games-engines/ponscripter/patches/ponscripter-20111009.patchset
similarity index 93%
rename from games-engines/ponscripter/patches/ponscripter_x86-20111009.patchset
rename to games-engines/ponscripter/patches/ponscripter-20111009.patchset
index 80b8b42c9..f678bf94e 100644
--- a/games-engines/ponscripter/patches/ponscripter_x86-20111009.patchset
+++ b/games-engines/ponscripter/patches/ponscripter-20111009.patchset
@@ -1,4 +1,5 @@
 From: Guest One <popov_e_n@mail.ru>
+Subject: Add missing header
 
 
 diff --git a/src/AnimationInfo.cpp b/src/AnimationInfo.cpp
diff --git a/games-engines/ponscripter/ponscripter-20111009.recipe b/games-engines/ponscripter/ponscripter-20111009.recipe
index ea23778f1..42f58fbe7 100644
--- a/games-engines/ponscripter/ponscripter-20111009.recipe
+++ b/games-engines/ponscripter/ponscripter-20111009.recipe
@@ -1,71 +1,61 @@
 SUMMARY="NScripter-like interpreter with proportional font and Unicode support"
-DESCRIPTION="A port of poular japanese Visual Novells engine with Unicode support"
-
+DESCRIPTION="Ponscripter is an NScripter-style novel-game interpreter with an \
+emphasis on supporting games in Western languages. The goal is to provide an \
+easy porting target for translation projects."
 HOMEPAGE="http://unclemion.com/onscripter/"
-SOURCE_URI="https://unclemion.com/dev/attachments/download/48/ponscripter-20111009-src.tar.bz2"
-CHECKSUM_SHA256="592a7cea2b89646c145eee095a66ef1c2b8a64c3d169b6b2b46da0829618ed3e"
-SOURCE_DIR="ponscripter-20111009-src"
-
 LICENSE="GNU GPL v2"
-COPYRIGHT="
-2001-2011, Ogapee
-2007-2011, Mion Sonozaki
-"
-REVISION="4"
-#
-# This package can not be build with gcc2
-#
-ARCHITECTURES="x86 ?x86_gcc2"
-SECONDARY_ARCHITECTURES="x86 ?x86_gcc2"
+COPYRIGHT="2001-2011 Ogapee
+	2006-2011 insani, Haeleth, Sonozaki et al"
+REVISION="5"
+SOURCE_URI="http://getdeb.megaglest.org/ubuntu/pool/games/p/ponscripter/ponscripter_$portVersion.orig.tar.bz2"
+CHECKSUM_SHA256="592a7cea2b89646c145eee095a66ef1c2b8a64c3d169b6b2b46da0829618ed3e"
+SOURCE_DIR="ponscripter-$portVersion-src"
+PATCHES="ponscripter-$portVersion.patchset"
+
+ARCHITECTURES="!x86_gcc2 x86_64 "
+SECONDARY_ARCHITECTURES="x86"
 
-PATCHES="ponscripter_x86-20111009.patchset"
 
 PROVIDES="
-	ponscripter${secondaryArchSuffix} = $portVersion
-	cmd:ponscr
+	ponscripter$secondaryArchSuffix = $portVersion
+	cmd:ponscr = $portVersion
 	"
 REQUIRES="
 	haiku${secondaryArchSuffix}
-	libsdl${secondaryArchSuffix} >= 1.2.14
-	sdl_image${secondaryArchSuffix} >= 1.2.10
-	sdl_ttf${secondaryArchSuffix} >= 1.2
-	sdl_mixer${secondaryArchSuffix} >= 1.2
-	smpeg${secondaryArchSuffix} >= 0.4.5
-	bzip2${secondaryArchSuffix}
-	freetype${secondaryArchSuffix}
-	libpng${secondaryArchSuffix}
-	jpeg${secondaryArchSuffix}
-	libogg${secondaryArchSuffix}
-	libvorbis${secondaryArchSuffix}
-	zlib${secondaryArchSuffix}
+	lib:libbz2$secondaryArchSuffix
+	lib:libfreetype$secondaryArchSuffix
+	lib:libogg$secondaryArchSuffix
+	lib:libSDL_1.2$secondaryArchSuffix
+	lib:libSDL_image_1.2$secondaryArchSuffix
+	lib:libSDL_mixer_1.2$secondaryArchSuffix
+	lib:libsmpeg$secondaryArchSuffix
+	lib:libvorbis$secondaryArchSuffix
+	lib:libz$secondaryArchSuffix
 	"
-BUILD_PREREQUIRES="
-	haiku${secondaryArchSuffix}_devel
-"
 
 BUILD_REQUIRES="
-	cmd:make
+	haiku${secondaryArchSuffix}_devel
+	devel:libbz2$secondaryArchSuffix
+	devel:libfreetype$secondaryArchSuffix
+	devel:libogg$secondaryArchSuffix
+	devel:libSDL$secondaryArchSuffix
+	devel:libSDL_image$secondaryArchSuffix
+	devel:libSDL_mixer$secondaryArchSuffix
+	devel:libsmpeg$secondaryArchSuffix
+	devel:libvorbis$secondaryArchSuffix
+	devel:libz$secondaryArchSuffix
+	"
+BUILD_PREREQUIRES="
 	cmd:awk
-	cmd:gcc${secondaryArchSuffix}
-	libsdl${secondaryArchSuffix}_devel >= 1.2.14
-	sdl_image${secondaryArchSuffix}_devel >= 1.2.10
-	sdl_ttf${secondaryArchSuffix}_devel >= 1.2
-	sdl_mixer${secondaryArchSuffix}_devel >= 1.2
-	smpeg${secondaryArchSuffix}_devel >= 0.4.5
-	bzip2${secondaryArchSuffix}_devel
-	freetype${secondaryArchSuffix}_devel
-	pkgconfig${secondaryArchSuffix}
-	libpng${secondaryArchSuffix}_devel
-	jpeg${secondaryArchSuffix}_devel
-	libogg${secondaryArchSuffix}_devel
-	libvorbis${secondaryArchSuffix}_devel
-	zlib${secondaryArchSuffix}_devel
-"
+	cmd:gcc$secondaryArchSuffix
+	cmd:make
+	cmd:pkg_config$secondaryArchSuffix
+	"
 
 BUILD()
 {
 
-	 runConfigure ./configure --no-werror
+	runConfigure ./configure --no-werror
 
 	#CFLAGS="-Wno-unused-but-set-variable"
 	make