diff --git a/srcpkgs/tinyxml/patches/entity.patch b/srcpkgs/tinyxml/patches/entity.patch
new file mode 100644
index 00000000000..e4814ed4522
--- /dev/null
+++ b/srcpkgs/tinyxml/patches/entity.patch
@@ -0,0 +1,63 @@
+Index: tinyxml.cpp
+===================================================================
+RCS file: /cvsroot/tinyxml/tinyxml/tinyxml.cpp,v
+retrieving revision 1.105
+diff -u -r1.105 tinyxml.cpp
+--- tinyxml.cpp	5 Jun 2010 19:06:57 -0000	1.105
++++ tinyxml.cpp	19 Jul 2010 21:24:16 -0000
+@@ -57,30 +57,7 @@
+ 	{
+ 		unsigned char c = (unsigned char) str[i];
+ 
+-		if (    c == '&' 
+-		     && i < ( (int)str.length() - 2 )
+-			 && str[i+1] == '#'
+-			 && str[i+2] == 'x' )
+-		{
+-			// Hexadecimal character reference.
+-			// Pass through unchanged.
+-			// &#xA9;	-- copyright symbol, for example.
+-			//
+-			// The -1 is a bug fix from Rob Laveaux. It keeps
+-			// an overflow from happening if there is no ';'.
+-			// There are actually 2 ways to exit this loop -
+-			// while fails (error case) and break (semicolon found).
+-			// However, there is no mechanism (currently) for
+-			// this function to return an error.
+-			while ( i<(int)str.length()-1 )
+-			{
+-				outString->append( str.c_str() + i, 1 );
+-				++i;
+-				if ( str[i] == ';' )
+-					break;
+-			}
+-		}
+-		else if ( c == '&' )
++		if ( c == '&' )
+ 		{
+ 			outString->append( entity[0].str, entity[0].strLength );
+ 			++i;
+Index: xmltest.cpp
+===================================================================
+RCS file: /cvsroot/tinyxml/tinyxml/xmltest.cpp,v
+retrieving revision 1.89
+diff -u -r1.89 xmltest.cpp
+--- xmltest.cpp	5 Jun 2010 17:41:52 -0000	1.89
++++ xmltest.cpp	19 Jul 2010 21:24:16 -0000
+@@ -1340,6 +1340,16 @@
+ 		}*/
+ 	}
+ 
++	#ifdef TIXML_USE_STL
++	{
++		TiXmlDocument xml;
++		xml.Parse("<foo>foo&amp;#xa+bar</foo>");
++		std::string str;
++		str << xml;
++		XmlTest( "Entity escaping", "<foo>foo&amp;#xa+bar</foo>", str.c_str() );
++	}
++	#endif
++
+ 	/*  1417717 experiment
+ 	{
+ 		TiXmlDocument xml;
diff --git a/srcpkgs/tinyxml/patches/tinyxml-2.5.3-stl.patch b/srcpkgs/tinyxml/patches/tinyxml-2.5.3-stl.patch
new file mode 100644
index 00000000000..2e03569dbb7
--- /dev/null
+++ b/srcpkgs/tinyxml/patches/tinyxml-2.5.3-stl.patch
@@ -0,0 +1,11 @@
+--- tinyxml.h~	2007-11-30 22:39:36.000000000 +0100
++++ tinyxml.h	2007-11-30 22:39:36.000000000 +0100
+@@ -26,6 +26,8 @@ distribution.
+ #ifndef TINYXML_INCLUDED
+ #define TINYXML_INCLUDED
+ 
++#define TIXML_USE_STL 1
++
+ #ifdef _MSC_VER
+ #pragma warning( push )
+ #pragma warning( disable : 4530 )
diff --git a/srcpkgs/tinyxml/template b/srcpkgs/tinyxml/template
index 0de0fdc65a0..fc667d7d7d2 100644
--- a/srcpkgs/tinyxml/template
+++ b/srcpkgs/tinyxml/template
@@ -1,7 +1,7 @@
 # Template file for 'tinyxml'
 pkgname=tinyxml
 version=2.6.2
-revision=1
+revision=2
 subpackages="${pkgname}-devel"
 short_desc="A simple, small, C++ XML parser that can be easily integrated into other programs"
 maintainer="Juan RP <xtraeme@gmail.com>"