diff --git a/games-kids/pipepanic/pipepanic-0.1.3.recipe b/games-kids/pipepanic/pipepanic-0.1.3.recipe
deleted file mode 100644
index de476189e..000000000
--- a/games-kids/pipepanic/pipepanic-0.1.3.recipe
+++ /dev/null
@@ -1,51 +0,0 @@
-SUMMARY="A pipe connecting game"
-DESCRIPTION="Pipepanic is a pipe connecting game using libSDL. Connect as many \
-different shaped pipes together as possible within the time given.
-"
-HOMEPAGE="http://www.users.waitrose.com/~thunor/pipepanic/"
-SOURCE_URI="http://www.users.waitrose.com/~thunor/pipepanic/dload/pipepanic-0.1.3-source.tar.gz"
-CHECKSUM_SHA256="4b02249c92228b03f4cc3c1d999cacf3fe52c16df53c6bf76fc6c1e2caa74318"
-SOURCE_DIR="pipepanic-0.1.3-source"
-LICENSE="GNU GPL v2"
-COPYRIGHT="2005-2013 Thunor"
-REVISION="3"
-ARCHITECTURES="x86_gcc2 x86"
-
-PROVIDES="
-	pipepanic = $portVersion
-	app:Pipepanic = $portVersion
-	"
-REQUIRES="
-	haiku
-	lib:libsdl
-	"
-BUILD_REQUIRES="
-	haiku_devel
-	devel:libsdl
-	cmd:xres
-	"
-BUILD_PREREQUIRES="
-	cmd:gcc
-	cmd:make
-	"
-USER_SETTINGS_FILES="
-	settings/pipepanic
-	"
-PATCHES="
-	pipepanic-0.1.3.patch
-	"
-
-BUILD()
-{
-	make
-	rc -o pipepanic.rsrc pipepanic.rdef
-	xres -o pipepanic pipepanic.rsrc
-}
-
-INSTALL()
-{
-	mkdir -p $appsDir/Pipepanic
-	mv pipepanic $appsDir/Pipepanic/Pipepanic
-	cp ascii15.bmp ascii30.bmp digits24.bmp digits48.bmp tiles24.bmp tiles48.bmp $appsDir/Pipepanic/
-	addAppDeskbarSymlink $appsDir/Pipepanic/Pipepanic
-}
diff --git a/games-puzzle/pipepanic/additional-files/pipepanic.rdef b/games-puzzle/pipepanic/additional-files/pipepanic.rdef
new file mode 100644
index 000000000..d68afce61
--- /dev/null
+++ b/games-puzzle/pipepanic/additional-files/pipepanic.rdef
@@ -0,0 +1,30 @@
+resource app_signature "application/x-vnd.Thnor-Pipepanic";
+
+resource app_version {
+	major  = @MAJOR@,
+	middle = @MIDDLE@,
+	minor  = @MINOR@,
+
+	variety = B_APPV_FINAL,
+	internal = 0,
+
+	short_info = "Pipepanic",
+	long_info  = "Pipepanic - A pipe connecting game.\nCopyright © 2006 TheGreenKnight"
+};
+
+resource app_flags B_SINGLE_LAUNCH;
+
+resource vector_icon {
+	$"6E636966070500020006030000003ABFAEBABFAE0000004B750A49FE3D1BFF00"
+	$"0082FF8C8CE0FF0000020006030000003ABFAEBABFAE0000004D228549FE3D1B"
+	$"197F008200FF00E0657F00020006030000003A2000BA20000000004AB0004A00"
+	$"00000000FF807272FFFB0000FF020006030000003A2000BA20000000004AB000"
+	$"4A000000CCBC3E7EFFEB4EFBCCBC3E020016030000003A123DBA123D00000048"
+	$"A6E149FEE1004883FFFD4804228D070A042635264B2F4B2F350A044B354B4B54"
+	$"4B54350A093C353CC41042C42042484A484A38423842BB5C3CBB5C0A04383538"
+	$"4B3C4B3C350A042F382F48384838380A042F382F49304930380A142F35263526"
+	$"4B2F4B2F483848384B424B42484B484B4B544B54354B354B3842384235383538"
+	$"382F380B0A0601062027280A0001061001178402040A010100000A020101000A"
+	$"030102000A040103000A050104000A000105000A0001052028200A0001052033"
+	$"200A000105203B1F"
+};
diff --git a/games-kids/pipepanic/patches/pipepanic-0.1.3.patch b/games-puzzle/pipepanic/patches/pipepanic-0.1.3.patch
similarity index 71%
rename from games-kids/pipepanic/patches/pipepanic-0.1.3.patch
rename to games-puzzle/pipepanic/patches/pipepanic-0.1.3.patch
index 1a6812cfb..05f8fdfb7 100644
--- a/games-kids/pipepanic/patches/pipepanic-0.1.3.patch
+++ b/games-puzzle/pipepanic/patches/pipepanic-0.1.3.patch
@@ -116,39 +116,3 @@ index 664b75b..178f665 100644
  
  #define MAGENTA 0xff, 0x00, 0xff
  #define YELLOW  0xff, 0xcc, 0x66
-diff --git a/pipepanic.rdef b/pipepanic.rdef
-new file mode 100644
-index 0000000..096d98d
---- /dev/null
-+++ b/pipepanic.rdef
-@@ -0,0 +1,30 @@
-+resource app_signature "application/x-vnd.Thnor-Pipepanic";
-+
-+resource app_version {
-+	major  = 0,
-+	middle = 1,
-+	minor  = 3,
-+
-+	variety = B_APPV_FINAL,
-+	internal = 0,
-+
-+	short_info = "A pipe connecting game",
-+	long_info  = "A pipe connecting game"
-+};
-+
-+resource app_flags B_SINGLE_LAUNCH;
-+
-+resource vector_icon {
-+	$"6E636966070500020006030000003ABFAEBABFAE0000004B750A49FE3D1BFF00"
-+	$"0082FF8C8CE0FF0000020006030000003ABFAEBABFAE0000004D228549FE3D1B"
-+	$"197F008200FF00E0657F00020006030000003A2000BA20000000004AB0004A00"
-+	$"00000000FF807272FFFB0000FF020006030000003A2000BA20000000004AB000"
-+	$"4A000000CCBC3E7EFFEB4EFBCCBC3E020016030000003A123DBA123D00000048"
-+	$"A6E149FEE1004883FFFD4804228D070A042635264B2F4B2F350A044B354B4B54"
-+	$"4B54350A093C353CC41042C42042484A484A38423842BB5C3CBB5C0A04383538"
-+	$"4B3C4B3C350A042F382F48384838380A042F382F49304930380A142F35263526"
-+	$"4B2F4B2F483848384B424B42484B484B4B544B54354B354B3842384235383538"
-+	$"382F380B0A0601062027280A0001061001178402040A010100000A020101000A"
-+	$"030102000A040103000A050104000A000105000A0001052028200A0001052033"
-+	$"200A000105203B1F"
-+};
diff --git a/games-puzzle/pipepanic/pipepanic-0.1.3.recipe b/games-puzzle/pipepanic/pipepanic-0.1.3.recipe
new file mode 100644
index 000000000..cd1f63918
--- /dev/null
+++ b/games-puzzle/pipepanic/pipepanic-0.1.3.recipe
@@ -0,0 +1,71 @@
+SUMMARY="A pipe connecting game"
+DESCRIPTION="Pipepanic is a pipe connecting game using libSDL. Connect as many \
+different shaped pipes together as possible within the time given."
+HOMEPAGE="http://www.users.waitrose.com/~thunor/pipepanic/"
+COPYRIGHT="2006 TheGreenKnight"
+LICENSE="GNU GPL v2"
+REVISION="4"
+SOURCE_URI="http://www.users.waitrose.com/~thunor/pipepanic/dload/pipepanic-$portVersion-source.tar.gz"
+CHECKSUM_SHA256="4b02249c92228b03f4cc3c1d999cacf3fe52c16df53c6bf76fc6c1e2caa74318"
+SOURCE_DIR="pipepanic-$portVersion-source"
+PATCHES="pipepanic-$portVersion.patch"
+ADDITIONAL_FILES="pipepanic.rdef"
+
+ARCHITECTURES="x86_gcc2 x86 x86_64"
+
+PROVIDES="
+	pipepanic = $portVersion
+	app:Pipepanic = $portVersion
+	"
+REQUIRES="
+	haiku
+	lib:libsdl
+	"
+
+BUILD_REQUIRES="
+	haiku_devel
+	devel:libsdl
+	"
+BUILD_PREREQUIRES="
+	cmd:cut
+	cmd:gcc
+	cmd:install
+	cmd:make
+	cmd:sdl_config
+	"
+
+USER_SETTINGS_FILES="
+	settings/pipepanic
+	"
+
+BUILD()
+{
+	make
+
+	MAJOR="`echo "$portVersion" | cut -d. -f1`"
+	MIDDLE="`echo "$portVersion" | cut -d. -f2`"
+	MINOR="`echo "$portVersion" | cut -d. -f3`"
+	sed \
+		-e "s|@MAJOR@|$MAJOR|" \
+		-e "s|@MIDDLE@|$MIDDLE|" \
+		-e "s|@MINOR@|$MINOR|" \
+		$portDir/additional-files/pipepanic.rdef \
+		> pipepanic.rdef
+
+	addResourcesToBinaries pipepanic.rdef pipepanic
+}
+
+INSTALL()
+{
+	install -m 755 -d $appsDir/Pipepanic $docDir
+
+	install -m 444 -t $appsDir/Pipepanic \
+		ascii15.bmp ascii30.bmp \
+		digits24.bmp digits48.bmp \
+		tiles24.bmp tiles48.bmp
+
+	install -m 444 -t $docDir README
+	install -m 555 -T pipepanic $appsDir/Pipepanic/Pipepanic
+
+	addAppDeskbarSymlink $appsDir/Pipepanic/Pipepanic
+}