diff --git a/cmake/ConfigureChecks.cmake b/cmake/ConfigureChecks.cmake
index 756d67fe..c44ea7ae 100644
--- a/cmake/ConfigureChecks.cmake
+++ b/cmake/ConfigureChecks.cmake
@@ -105,7 +105,7 @@ try_compile(DBUS_HAVE_VA_COPY
             ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeTmp/cmake_try_compile.c)
 
 if(DBUS_HAVE_VA_COPY)
-  SET(DBUS_VA_COPY va_copy CACHE STRING "va_copy function")
+  SET(DBUS_VA_COPY_FUNC va_copy CACHE STRING "va_copy function")
 else(DBUS_HAVE_VA_COPY)
   write_file("${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeTmp/cmake_try_compile.c" "#include <stdarg.h>
 	  void f (int i, ...) {
@@ -121,10 +121,12 @@ else(DBUS_HAVE_VA_COPY)
 	    return 0;
 	  }
   ")
-  try_compile(DBUS_HAVE_VA_COPY
+  try_compile(DBUS_HAVE___VA_COPY
               ${CMAKE_BINARY_DIR}
               ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeTmp/cmake_try_compile.c)
   if(DBUS_HAVE___VA_COPY)
-    SET(DBUS_VA_COPY __va_copy CACHE STRING "va_copy function")
+    SET(DBUS_VA_COPY_FUNC __va_copy CACHE STRING "va_copy function")
+  else(DBUS_HAVE___VA_COPY)
+    SET(DBUS_VA_COPY_AS_ARRAY "1" CACHE STRING "'va_lists' cannot be copies as values")
   endif(DBUS_HAVE___VA_COPY)
 endif(DBUS_HAVE_VA_COPY)
diff --git a/cmake/config.h.cmake b/cmake/config.h.cmake
index 63afe558..047135b2 100644
--- a/cmake/config.h.cmake
+++ b/cmake/config.h.cmake
@@ -64,7 +64,12 @@
 
 #cmakedefine DBUS_BUILD_X11 1
 
-#cmakedefine DBUS_VA_COPY @DBUS_VA_COPY_FUNC@
+#cmakedefine DBUS_VA_COPY_FUNC
+#if (defined DBUS_VA_COPY_FUNC)
+# define DBUS_VA_COPY @DBUS_VA_COPY_FUNC@
+#endif
+
+#cmakedefine DBUS_VA_COPY_AS_ARRAY 1
 
 // headers
 /* Define to 1 if you have dirent.h */
@@ -165,9 +170,6 @@
 #  define strtoull _strtoui64
    typedef int mode_t;
 # endif
-# ifdef DBUS_VA_COPY
-#  undef DBUS_VA_COPY // DBUS_VA_COPY kills mingw's bus-test
-# endif
 #endif	// defined(_WIN32) || defined(_WIN64)
 
 #ifdef interface