diff --git a/package/Config.in b/package/Config.in
index 3bf3434663..397cc11d1b 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -624,6 +624,7 @@ source "package/libxslt/Config.in"
 source "package/libyaml/Config.in"
 source "package/mxml/Config.in"
 source "package/rapidjson/Config.in"
+source "package/tinyxml/Config.in"
 source "package/xerces/Config.in"
 source "package/yajl/Config.in"
 endmenu
diff --git a/package/tinyxml/Config.in b/package/tinyxml/Config.in
new file mode 100644
index 0000000000..061ff67146
--- /dev/null
+++ b/package/tinyxml/Config.in
@@ -0,0 +1,11 @@
+config BR2_PACKAGE_TINYXML
+	bool "tinyxml"
+	depends on BR2_INSTALL_LIBSTDCPP
+	help
+	  TinyXML is a simple, small, C++ XML parser that can be
+	  easily integrating into other programs.
+
+	  https://github.com/leethomason/tinyxml2
+
+comment "tinyxml needs a toolchain w/ C++"
+	depends on !BR2_INSTALL_LIBSTDCPP
diff --git a/package/tinyxml/tinyxml.mk b/package/tinyxml/tinyxml.mk
new file mode 100644
index 0000000000..df7b29fefb
--- /dev/null
+++ b/package/tinyxml/tinyxml.mk
@@ -0,0 +1,16 @@
+################################################################################
+#
+# tinyxml
+#
+################################################################################
+
+TINYXML_VERSION = 2.6.2_2
+TINYXML_SITE = http://mirrors.xbmc.org/build-deps/sources
+# AUTORECONF is needed because the XBMC's version of TinyXML contains a
+# configure.ac which is not present in mainline.
+TINYXML_AUTORECONF = YES
+TINYXML_INSTALL_STAGING = YES
+TINYXML_LICENSE = zlib
+TINYXML_LICENSE_FILES = README
+
+$(eval $(autotools-package))