diff --git a/.bzrignore b/.bzrignore
index 62093df1..57215a87 100644
--- a/.bzrignore
+++ b/.bzrignore
@@ -1,20 +1,20 @@
-*.aif
-*.aifc
-*.aiff
-*.au
-*.bin
+#*.aif
+#*.aifc
+#*.aiff
+#*.au
+#*.bin
 *.exe
-*.flac
+#*.flac
 *.la
 *.lo
 *.loT
-*.oct
-*.oga
-*.paf
-*.sd2
-*.sds
-*.svx
-*.wav
+#*.oct
+#*.oga
+#*.paf
+#*.sd2
+#*.sds
+#*.svx
+#*.wav
 .deps
 .libs
 Cfg/compile
@@ -44,7 +44,7 @@ examples/sndfile-info
 examples/sndfile-jackplay
 examples/sndfile-play
 examples/sndfilehandle
-libsndfile-1.0.*pre*
+libsndfile-1.0.*
 libsndfile.spec
 libtool
 regtest/sndfile-regtest
@@ -80,6 +80,7 @@ tests/benchmark.c
 tests/fix_this
 tests/floating_point_test.c
 tests/header_test.c
+tests/libsndfile-1.dll
 tests/pcm_test.c
 tests/pipe_test.c
 tests/scale_clip_test.c
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 682e53aa..49c9f6f5 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -165,6 +165,22 @@ benchmark.c: benchmark.def benchmark.tpl
 genfiles : write_read_test.c pcm_test.c header_test.c utils.c \
 		scale_clip_test.c pipe_test.c floating_point_test.c benchmark.c
 
+#===============================================================================
+# If we're cross compiling from Linux to Windows and running the test suite
+# under Wine, we need a symbolic link to the generated libsndfile DLL.
+
+if LINUX_MINGW_CROSS_TEST
+
+$(noinst_PROGRAMS) : libsndfile-1.dll
+
+libsndfile-1.dll :
+	ln -s $(top_builddir)/src/.libs/$@ $@
+
+clean-local :
+	-rm -f libsndfile-1.dll
+
+endif
+
 #===============================================================================
 
 check: generic-tests wav-tests aiff-tests au-tests caf-tests raw-tests \