diff --git a/dev-libs/tinyxml/tinyxml-2.6.2.recipe b/dev-libs/tinyxml/tinyxml-2.6.2.recipe
index 751918998..d89dd191e 100644
--- a/dev-libs/tinyxml/tinyxml-2.6.2.recipe
+++ b/dev-libs/tinyxml/tinyxml-2.6.2.recipe
@@ -1,32 +1,73 @@
+SUMMARY="Small C++ XML Parser"
 DESCRIPTION="
 TinyXML is a simple, small, C++ XML parser that can be easily integrating into \
 other programs.
 "
 HOMEPAGE="http://www.grinninglizard.com/tinyxml/index.html"
-SRC_URI="http://en.sourceforge.jp/frs/g_redir.php?m=jaist&f=%2Ftinyxml%2Ftinyxml%2F2.6.2%2Ftinyxml_2_6_2.tar.gz"
-CHECKSUM_MD5="c1b864c96804a10526540c664ade67f0"
+COPYRIGHT="2001-2010 Lee Thomason"
+LICENSE="Zlib"
+SRC_URI="http://sourceforge.net/projects/tinyxml/files/tinyxml/$portVersion/tinyxml_2_6_2.tar.gz"
+CHECKSUM_SHA256="15bdfdcec58a7da30adc87ac2b078e4417dbe5392f3afb719f9ba6d062645593"
+SRC_URI_2="http://libtinyxml.googlecode.com/svn/trunk/CMakeLists.txt#noarchive"
+CHECKSUM_SHA256_2="12a412abedaf30fff9c75273c1ac7239a7b4b59dd34bdadedd913a9717a3a105"
 REVISION="1"
-STATUS_HAIKU="untested"
-DEPEND=""
+ARCHITECTURES="x86_gcc2 x86 x86_64"
+SECONDARY_ARCHITECTURES="x86_gcc2 x86"
+
+PROVIDES="
+	tinyxml$secondaryArchSuffix = $portVersion compat >= 2
+	lib:libtinyxml$secondaryArchSuffix = $portVersion compat >= 2
+	"
+REQUIRES="
+	haiku$secondaryArchSuffix >= $haikuVersion
+	lib:libgcc_s$secondaryArchSuffix
+	lib:libstdc++$secondaryArchSuffix
+	"
+BUILD_REQUIRES="
+	"
+BUILD_PREREQUIRES="
+	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	cmd:cmake
+	cmd:gcc$secondaryArchSuffix
+	cmd:grep
+	cmd:ld$secondaryArchSuffix
+	cmd:make
+	cmd:sed
+	"
+	
+SOURCE_DIR="tinyxml"
 
 BUILD()
 {
-	cd tinyxml
-	rm xmltest.cpp
-	wget http://libtinyxml.googlecode.com/svn/trunk/CMakeLists.txt
-	cmake ./
-	make
+	cp ../../sources-2/CMakeLists.txt ./
+	sed -i 's/GLOB_RECURSE/GLOB/' CMakeLists.txt
+	cmake -DCMAKE_INSTALL_PREFIX:PATH=$prefix
+	make $jobArgs
 }
 
 INSTALL()
 {
-	cd tinyxml
 	make install
-	mkdir -p ${DESTDIR}`finddir B_COMMON_DEVELOP_DIRECTORY`/tinyxml
-	cp ./*.cpp ${DESTDIR}`finddir B_COMMON_DEVELOP_DIRECTORY`/tinyxml
-	mkdir -p ${DESTDIR}`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/doc/tinyxml
-	cp ./docs/* ${DESTDIR}`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/doc/tinyxml
+	
+	# move headers to the correct location
+	mkdir -p $includeDir $libDir	
+	mv $prefix/include/* $includeDir
+	[ "$prefix/lib" != "$libDir" ] && mv $prefix/lib/*.so $libDir
+	rmdir $prefix/include/
+	
+	prepareInstalledDevelLibs libtinyxml
+
+	# devel package
+	packageEntries devel \
+		$developDir
 }
 
-LICENSE="Zlib"
-COPYRIGHT="2001-2010 Lee Thomason"
+# ----- devel package -------------------------------------------------------
+
+PROVIDES_devel="
+	tinyxml${secondaryArchSuffix}_devel = $portVersion compat >= 2
+	devel:libtinyxml${secondaryArchSuffix} = $portVersion compat >= 2
+	"
+REQUIRES_devel="
+	tinyxml${secondaryArchSuffix} == $portVersion base
+	"