diff --git a/dtool/Config.pp b/dtool/Config.pp
index f6f38116fa..90aff29042 100644
--- a/dtool/Config.pp
+++ b/dtool/Config.pp
@@ -824,21 +824,24 @@
 #defer HAVE_RAD_MSS $[libtest $[RAD_MSS_LPATH],$[RAD_MSS_LIBS]]
 
 // Info for the Fmod audio engine
-// note this may be overwritten in wintools Config.pp
 #define FMODEX_IPATH /usr/local/fmod/api/inc
 #define FMODEX_LPATH /usr/local/fmod/api/lib
 #define FMODEX_LIBS $[if $[libtest $[FMODEX_LPATH],fmodex64],fmodex64,fmodex]
 #defer HAVE_FMODEX $[libtest $[FMODEX_LPATH],$[FMODEX_LIBS]]
 
 // Info for the Ageia PhysX SDK
-// note this may be overwritten in wintools Config.pp
 #define PHYSX_IPATH
 #define PHYSX_LPATH
 #define PHYSX_LIBS PhysXLoader.lib NxCharacter.lib NxCooking.lib NxExtensions.lib
 #defer HAVE_PHYSX $[libtest $[PHYSX_LPATH],$[PHYSX_LIBS]]
 
+// Info for TinyXML library
+#define TINYXML_IPATH
+#define TINYXML_LPATH
+#define TINYXML_LIBS $[if $[WINDOWS_PLATFORM],tinyxml.lib,tinyxml]
+#defer HAVE_TINYXML $[libtest $[TINYXML_LPATH],$[TINYXML_LIBS]]
+
 // Info for http://www.sourceforge.net/projects/chromium
-// note this may be overwritten in wintools Config.pp
 #define CHROMIUM_IPATH /usr/include/chromium/include
 #define CHROMIUM_LPATH /usr/lib/chromium/bin/WINT_NT
 #define CHROMIUM_LIBS spuload
diff --git a/dtool/LocalSetup.pp b/dtool/LocalSetup.pp
index c433ccb307..dc1b8e1692 100644
--- a/dtool/LocalSetup.pp
+++ b/dtool/LocalSetup.pp
@@ -96,6 +96,11 @@
 #else
 #print - Did not find Ageia PhysX
 #endif
+#if $[HAVE_TINYXML]
+#print + TinyXML
+#else
+#print - Did not find TinyXML
+#endif
 #if $[HAVE_GTK]
 #print + gtk+-2
 #else
diff --git a/dtool/Package.pp b/dtool/Package.pp
index f9f5080edb..03d9528013 100644
--- a/dtool/Package.pp
+++ b/dtool/Package.pp
@@ -262,6 +262,11 @@
 #set PHYSX_LIBS $[PHYSX_LIBS]
 #set HAVE_PHYSX $[HAVE_PHYSX]
 
+#set TINYXML_IPATH $[unixfilename $[TINYXML_IPATH]]
+#set TINYXML_LPATH $[unixfilename $[TINYXML_LPATH]]
+#set TINYXML_LIBS $[TINYXML_LIBS]
+#set HAVE_TINYXML $[HAVE_TINYXML]
+
 #set CHROMIUM_IPATH $[unixfilename $[CHROMIUM_IPATH]]
 #set CHROMIUM_LPATH $[unixfilename $[CHROMIUM_LPATH]]
 #set CHROMIUM_LIBS $[CHROMIUM_LIBS]
diff --git a/dtool/pptempl/Global.pp b/dtool/pptempl/Global.pp
index 9b8fbd4afc..bed73cdbcc 100644
--- a/dtool/pptempl/Global.pp
+++ b/dtool/pptempl/Global.pp
@@ -372,6 +372,12 @@
   #define physx_libs $[PHYSX_LIBS]
 #endif
 
+#if $[HAVE_TINYXML]
+  #define tinyxml_ipath $[wildcard $[TINYXML_IPATH]]
+  #define tinyxml_lpath $[wildcard $[TINYXML_LPATH]]
+  #define tinyxml_libs $[TINYXML_LIBS]
+#endif
+
 #if $[HAVE_CHROMIUM]
   #define chromium_ipath $[wildcard $[CHROMIUM_IPATH]]
   #define chromium_lpath $[wildcard $[CHROMIUM_LPATH]]