diff --git a/Makefile.am b/Makefile.am
index a4f49d3d33256..fe1ef948918c4 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -56,7 +56,9 @@ EXTRA_DIST = \
 	doxygen \
 	bin/git_sha1_gen.py \
 	scons \
-	SConstruct
+	SConstruct \
+	build-support/conftest.dyn \
+	build-support/conftest.map
 
 noinst_HEADERS = \
 	include/c99_alloca.h \
diff --git a/build-support/conftest.dyn b/build-support/conftest.dyn
new file mode 100644
index 0000000000000..8d243dc0a796b
--- /dev/null
+++ b/build-support/conftest.dyn
@@ -0,0 +1,3 @@
+{
+	radeon_drm_winsys_create;
+};
diff --git a/build-support/conftest.map b/build-support/conftest.map
new file mode 100644
index 0000000000000..7d8590ff35730
--- /dev/null
+++ b/build-support/conftest.map
@@ -0,0 +1,6 @@
+VERSION_1 {
+    global:
+        main;
+    local:
+        *;
+};
diff --git a/configure.ac b/configure.ac
index 62d33a1941c32..bbabf3bed7c55 100644
--- a/configure.ac
+++ b/configure.ac
@@ -606,16 +606,7 @@ dnl Check if linker supports version scripts
 dnl
 AC_MSG_CHECKING([if the linker supports version-scripts])
 save_LDFLAGS=$LDFLAGS
-LDFLAGS="$LDFLAGS -Wl,--version-script=conftest.map"
-cat > conftest.map <<EOF
-VERSION_1 {
-     global:
-         main;
-
-     local:
-         *;
-};
-EOF
+LDFLAGS="$LDFLAGS -Wl,--version-script=$srcdir/build-support/conftest.map"
 AC_LINK_IFELSE(
     [AC_LANG_SOURCE([int main() { return 0;}])],
     [have_ld_version_script=yes;AC_MSG_RESULT(yes)],
@@ -628,12 +619,7 @@ dnl Check if linker supports dynamic list files
 dnl
 AC_MSG_CHECKING([if the linker supports --dynamic-list])
 save_LDFLAGS=$LDFLAGS
-LDFLAGS="$LDFLAGS -Wl,--dynamic-list=conftest.dyn"
-cat > conftest.dyn <<EOF
-{
-	radeon_drm_winsys_create;
-};
-EOF
+LDFLAGS="$LDFLAGS -Wl,--dynamic-list=$srcdir/build-support/conftest.dyn"
 AC_LINK_IFELSE(
     [AC_LANG_SOURCE([int main() { return 0;}])],
     [have_ld_dynamic_list=yes;AC_MSG_RESULT(yes)],