diff --git a/ChangeLog b/ChangeLog
index 9638791..e7acc42 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -362,6 +362,13 @@ Version 1.8.0
 Version 1.6.20
 *******************************************************************************
 
+2015-02-01 Jean-Francois Dockes <medoc@users.sf.net>
+
+        Out-of-tree builds seem to be currently broken, because ixml and
+        threadutil files need an include path to include UpnpGlobal.h, and
+        configure tries to copy files into a directory which it does not create.
+        The patch fixes both issues.
+
 2014-01-03 Peng <howtofly(at)gmail.com>
 
 	rewrite soap_device.c
diff --git a/THANKS b/THANKS
index 5173966..1081c06 100644
--- a/THANKS
+++ b/THANKS
@@ -38,6 +38,7 @@ exempt of errors.
 - Ingo Hofmann
 - Ivan Romanov (ivanromanov)
 - Jiri Zouhar
+- Jean-Francois Dockes (medoc)
 - John Dennis
 - Jonathan Casiot (no_dice)
 - Josh Carroll
diff --git a/configure.ac b/configure.ac
index 17d4751..dd88734 100644
--- a/configure.ac
+++ b/configure.ac
@@ -718,6 +718,7 @@ AC_OUTPUT
 # Files copied for windows compilation.
 #
 echo "configure: copying \"autoconfig.h\"          to \"build/inc/autoconfig.h\""
+test -d build/inc || mkdir -p build/inc
 cp autoconfig.h build/inc/autoconfig.h
 echo "configure: copying \"upnp/inc/upnpconfig.h\" to \"build/inc/upnpconfig.h\""
 cp upnp/inc/upnpconfig.h build/inc/upnpconfig.h
diff --git a/ixml/Makefile.am b/ixml/Makefile.am
index 7556dde..a3ebad7 100644
--- a/ixml/Makefile.am
+++ b/ixml/Makefile.am
@@ -7,7 +7,8 @@
 
 SUBDIRS 		= doc
 
-AM_CPPFLAGS		= -I$(srcdir)/inc -I$(srcdir)/src/inc
+AM_CPPFLAGS		= -I$(srcdir)/inc -I$(srcdir)/src/inc \
+                          -I$(top_srcdir)/upnp/inc
 AM_CFLAGS		= 
 
 LDADD			= libixml.la
diff --git a/threadutil/Makefile.am b/threadutil/Makefile.am
index 0e50c5b..5cf58d7 100644
--- a/threadutil/Makefile.am
+++ b/threadutil/Makefile.am
@@ -4,7 +4,8 @@
 # (C) Copyright 2005 Remi Turboult <r3mi@users.sourceforge.net>
 #
 
-AM_CPPFLAGS		= -I$(srcdir)/inc -I$(srcdir)/src/inc
+AM_CPPFLAGS		= -I$(srcdir)/inc -I$(srcdir)/src/inc \
+                          -I$(top_srcdir)/upnp/inc
 
 if ENABLE_DEBUG
     AM_CPPFLAGS		+= -DDEBUG -DSTATS