diff --git a/configure.in b/configure.in
index 1e86e89..e4e9cef 100644
--- a/configure.in
+++ b/configure.in
@@ -241,6 +241,21 @@ else
 	AC_MSG_RESULT(no)
 fi
 
+dnl this check is stolen from xmlrpc-c which is borrowed from Python 1.5.2.
+AC_MSG_CHECKING([whether va_list is an array])
+AC_TRY_COMPILE([
+	#include <stdarg.h>
+],[
+	va_list list1, list2; list1 = list2;
+],, va_list_is_array=yes)
+
+if test "x$va_list_is_array" = "xyes"; then
+	AC_DEFINE(VA_LIST_IS_ARRAY, 1, [Define to 1 if your va_list is array])
+	AC_MSG_RESULT(yes)
+else
+	AC_MSG_RESULT(no)
+fi
+
 dnl expand variables before EDE_INIT_JAM convert them to jam variables
 EDE_EXPAND(sysconfdir, "NONE", my_sysconfdir)
 
diff --git a/ede-bug-tools/ede-bug-report/Jamfile b/ede-bug-tools/ede-bug-report/Jamfile
index 601d65a..d7e667a 100644
--- a/ede-bug-tools/ede-bug-report/Jamfile
+++ b/ede-bug-tools/ede-bug-report/Jamfile
@@ -16,6 +16,8 @@ XMLRPC_C_TOP      = $(XMLRPC_C_SRC_PATH) ;
 XMLRPC_C_LIB_DIR  = [ FDirName $(XMLRPC_C_SRC_PATH) lib ] ;
 
 XMLRPC_C_FLAGS = 
+		-DHAVE_CONFIG_H
+		-I$(TOP)
 		-I$(XMLRPC_C_SRC_PATH) 
 		-I [ FDirName $(XMLRPC_C_SRC_PATH) include ] 
 		-I [ FDirName $(XMLRPC_C_SRC_PATH) deps util include ]
diff --git a/ede-bug-tools/ede-bug-report/xmlrpc-c/xmlrpc_config.h b/ede-bug-tools/ede-bug-report/xmlrpc-c/xmlrpc_config.h
index d1dd132..a5f1233 100644
--- a/ede-bug-tools/ede-bug-report/xmlrpc-c/xmlrpc_config.h
+++ b/ede-bug-tools/ede-bug-report/xmlrpc-c/xmlrpc_config.h
@@ -32,6 +32,13 @@
 */
 #include "xmlrpc_amconfig.h"
 
+/* EDE top config file */
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+/* PREFIX is variable in xmlrpc-c code, but is defined in config.h too */
+#undef PREFIX
+#endif
+
 #ifndef HAVE_SETGROUPS
 #define HAVE_SETGROUPS 0
 #endif
@@ -70,7 +77,9 @@
 #define HAVE_SYS_FILIO_H 0
 #define HAVE_SYS_IOCTL_H 1
 
+#ifndef VA_LIST_IS_ARRAY
 #define VA_LIST_IS_ARRAY 0
+#endif
 
 #define HAVE_LIBWWW_SSL 0