diff -up filezilla-3.0.11-rc1/configure.in.system filezilla-3.0.11-rc1/configure.in
--- filezilla-3.0.11-rc1/configure.in.system	2008-06-09 18:31:44.000000000 +0200
+++ filezilla-3.0.11-rc1/configure.in	2008-06-12 23:30:33.000000000 +0200
@@ -347,6 +347,24 @@ AH_BOTTOM([
   AC_SUBST(LIBGNUTLS_LIBS)
   AC_SUBST(LIBGNUTLS_CFLAGS)
 
+  # TinyXML
+  # ------
+
+AC_CHECK_LIB(tinyxml, main,
+	[
+		AC_DEFINE(HAVE_LIBTINYXML, 1, [Define to 1 if you have the `tinyxml' library (-ltinyxml).])
+		TINYXML_LIBS="-ltinyxml"
+		have_tinyxml="true"
+	],
+	[
+		TINYXML_LIBS="../tinyxml/libtinyxml.a"
+		have_tinyxml="false"
+	]
+)
+
+  AC_SUBST(TINYXML_LIBS)
+  AC_SUBST(TINYXML_CFLAGS)
+
 fi
 
 # Everything translation related
@@ -431,6 +449,7 @@ AM_CONDITIONAL(MAKENSISSCRIPT, [test "$m
 AM_CONDITIONAL(USE_BINRELOC, test "$use_binreloc" = "yes")
 AM_CONDITIONAL(ENABLE_PRECOMP, test "x$use_precomp" = "xyes")
 AM_CONDITIONAL(HAS_CPPUNIT, [test "$has_cppunit" = "yes"])
+AM_CONDITIONAL(HAVE_LIBTINYXML, [test x$have_tinyxml = xtrue])
 
 AC_CONFIG_FILES(Makefile src/Makefile src/engine/Makefile src/tinyxml/Makefile
 src/interface/Makefile src/interface/resources/Makefile src/include/Makefile
diff -up filezilla-3.0.11-rc1/src/Makefile.am.system filezilla-3.0.11-rc1/src/Makefile.am
--- filezilla-3.0.11-rc1/src/Makefile.am.system	2008-06-09 18:31:45.000000000 +0200
+++ filezilla-3.0.11-rc1/src/Makefile.am	2008-06-12 23:39:08.000000000 +0200
@@ -2,6 +2,13 @@ if MINGW
   MAYBE_FZSHELLEXT = fzshellext
 endif
 
-SUBDIRS = include engine tinyxml interface putty $(MAYBE_FZSHELLEXT) .
+if HAVE_LIBTINYXML
+else
+  MAYBE_TINYXML = tinyxml
+endif
+
+SUBDIRS = include engine $(MAYBE_TINYXML) interface putty $(MAYBE_FZSHELLEXT) .
+
+
 
 dist_noinst_DATA = FileZilla.sln
diff -up filezilla-3.0.11-rc1/src/interface/xmlfunctions.h.system filezilla-3.0.11-rc1/src/interface/xmlfunctions.h
--- filezilla-3.0.11-rc1/src/interface/xmlfunctions.h.system	2008-06-09 18:31:46.000000000 +0200
+++ filezilla-3.0.11-rc1/src/interface/xmlfunctions.h	2008-06-12 23:30:33.000000000 +0200
@@ -6,7 +6,11 @@
 #ifndef __XMLFUNCTIONS_H__
 #define __XMLFUNCTIONS_H__
 
+#ifdef HAVE_LIBTINYXML
+#include <tinyxml.h>
+#else
 #include "../tinyxml/tinyxml.h"
+#endif
 
 class CXmlFile
 {
diff -up filezilla-3.0.11-rc1/src/interface/filter.cpp.system filezilla-3.0.11-rc1/src/interface/filter.cpp
--- filezilla-3.0.11-rc1/src/interface/filter.cpp.system	2008-06-09 18:31:46.000000000 +0200
+++ filezilla-3.0.11-rc1/src/interface/filter.cpp	2008-06-12 23:30:33.000000000 +0200
@@ -3,7 +3,11 @@
 #include "filteredit.h"
 #include "ipcmutex.h"
 #include "filezillaapp.h"
+#ifdef HAVE_LIBTINYXML
+#include <tinyxml.h>
+#else
 #include "../tinyxml/tinyxml.h"
+#endif
 #include "xmlfunctions.h"
 #include <wx/regex.h>
 #include "Mainfrm.h"
diff -up filezilla-3.0.11-rc1/src/interface/locale_initializer.cpp.system filezilla-3.0.11-rc1/src/interface/locale_initializer.cpp
--- filezilla-3.0.11-rc1/src/interface/locale_initializer.cpp.system	2008-06-09 18:31:45.000000000 +0200
+++ filezilla-3.0.11-rc1/src/interface/locale_initializer.cpp	2008-06-12 23:30:33.000000000 +0200
@@ -1,6 +1,10 @@
 #include "FileZilla.h"
 #include "locale_initializer.h"
+#ifdef HAVE_LIBTINYXML
+#include <tinyxml.h>
+#else
 #include "../tinyxml/tinyxml.h"
+#endif
 #include <string>
 #include <locale.h>
 
diff -up filezilla-3.0.11-rc1/src/interface/sitemanager.cpp.system filezilla-3.0.11-rc1/src/interface/sitemanager.cpp
--- filezilla-3.0.11-rc1/src/interface/sitemanager.cpp.system	2008-06-09 18:31:45.000000000 +0200
+++ filezilla-3.0.11-rc1/src/interface/sitemanager.cpp	2008-06-12 23:30:33.000000000 +0200
@@ -1,7 +1,11 @@
 #include "FileZilla.h"
 #include "sitemanager.h"
 #include "Options.h"
+#ifdef HAVE_LIBTINYXML
+#include <tinyxml.h>
+#else
 #include "../tinyxml/tinyxml.h"
+#endif
 #include "xmlfunctions.h"
 #include "filezillaapp.h"
 #include "ipcmutex.h"
diff -up filezilla-3.0.11-rc1/src/interface/Options.cpp.system filezilla-3.0.11-rc1/src/interface/Options.cpp
--- filezilla-3.0.11-rc1/src/interface/Options.cpp.system	2008-06-09 18:31:45.000000000 +0200
+++ filezilla-3.0.11-rc1/src/interface/Options.cpp	2008-06-12 23:30:33.000000000 +0200
@@ -1,6 +1,10 @@
 #include "FileZilla.h"
 #include "Options.h"
+#ifdef HAVE_LIBTINYXML
+#include <tinyxml.h>
+#else
 #include "../tinyxml/tinyxml.h"
+#endif
 #include "xmlfunctions.h"
 #include "filezillaapp.h"
 #include <wx/tokenzr.h>
diff -up filezilla-3.0.11-rc1/src/interface/Makefile.am.system filezilla-3.0.11-rc1/src/interface/Makefile.am
--- filezilla-3.0.11-rc1/src/interface/Makefile.am.system	2008-06-09 18:31:46.000000000 +0200
+++ filezilla-3.0.11-rc1/src/interface/Makefile.am	2008-06-12 23:30:33.000000000 +0200
@@ -184,7 +184,7 @@ filezilla_CXXFLAGS = $(WX_CXXFLAGS_ONLY)
 filezilla_CFLAGS = $(WX_CFLAGS_ONLY)
 
 filezilla_LDFLAGS = ../engine/libengine.a
-filezilla_LDFLAGS += ../tinyxml/libtinyxml.a
+filezilla_LDFLAGS += $(TINYXML_LIBS)
 filezilla_LDFLAGS += $(LIBGNUTLS_LIBS)
 filezilla_LDFLAGS += $(WX_LIBS)
 filezilla_LDFLAGS += $(RESOURCEFILE)
@@ -194,8 +194,12 @@ if MINGW
 filezilla_LDFLAGS += -lole32 -luuid -lnetapi32
 endif
 
-filezilla_DEPENDENCIES = ../engine/libengine.a \
-			../tinyxml/libtinyxml.a
+filezilla_DEPENDENCIES = ../engine/libengine.a
+
+if HAVE_LIBTINYXML
+else
+filezilla_DEPENDENCIES += $(TINYXML_LIBS)
+endif
 
 dist_noinst_DATA = interface.vcproj
 
diff -up filezilla-3.0.11-rc1/src/interface/QueueView.cpp.system filezilla-3.0.11-rc1/src/interface/QueueView.cpp
--- filezilla-3.0.11-rc1/src/interface/QueueView.cpp.system	2008-06-09 18:31:45.000000000 +0200
+++ filezilla-3.0.11-rc1/src/interface/QueueView.cpp	2008-06-12 23:30:33.000000000 +0200
@@ -4,7 +4,11 @@
 #include "Options.h"
 #include "StatusView.h"
 #include "statuslinectrl.h"
+#ifdef HAVE_LIBTINYXML
+#include <tinyxml.h>
+#else
 #include "../tinyxml/tinyxml.h"
+#endif
 #include "xmlfunctions.h"
 #include "filezillaapp.h"
 #include "ipcmutex.h"