diff --git a/ChangeLog b/ChangeLog
index 4a292b4e..c86ebf3e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2004-10-06  Erik de Castro Lopo  <erikd AT mega-nerd DOT com>
+
+    * src/configure.ac src/makefile.am
+    Finally fix the bulding of DLLs on Win32/MinGW.
+
+    * tests/makefile.am
+    Fix running of tests on Win32/MinGW.
+
 2004-10-01  Erik de Castro Lopo  <erikd AT mega-nerd DOT com>
 
     * src/sndfile.h.in src/sndfile.c tests/floating_point_test.tpl
diff --git a/extended-build.mk b/extended-build.mk
deleted file mode 100644
index 80420585..00000000
--- a/extended-build.mk
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/usr/bin/make -f
-
-TARGET = libsndfile-binary.tar.gz
-
-LIBS = tmp/lib/libogg.a tmp/lib/libvorbis.a tmp/lib/libspeex.a \
-		tmp/lib/liboggz.a tmp/lib/libfishsound.a
-
-libsndfile-binary.tar.gz :
-
-tmp/lib/libogg.a : tmp/src/lib
-	
-
-
-
-# Do not edit or modify anything in this comment block.
-# The arch-tag line is a file identity tag for the GNU Arch 
-# revision control system.
-#
-# arch-tag: 0072f040-d4a6-4f8d-b183-a0f6d3b907c7
diff --git a/src/Makefile.am b/src/Makefile.am
index 7a414ad8..1a4a62ae 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -23,8 +23,9 @@ FILESPECIFIC = aiff.c au.c au_g72x.c avr.c ircam.c macbinary3.c macos.c mat4.c \
 				mat5.c nist.c paf.c pvf.c raw.c svx.c voc.c htk.c dwd.c ogg.c \
 				rx2.c sd2.c sds.c txw.c wve.c w64.c wav_w64.c wav.c xi.c
 				
-libsndfile_la_SOURCES = $(COMMON) $(FILESPECIFIC) $(noinst_HEADERS) sndfile.h
+# MinGW requires -no-undefined if a DLL is to be built.
 libsndfile_la_LDFLAGS = -no-undefined -version-info @SHARED_VERSION_INFO@ @SHLIB_VERSION_ARG@
+libsndfile_la_SOURCES = $(COMMON) $(FILESPECIFIC) $(noinst_HEADERS) sndfile.h
 libsndfile_la_LIBADD  = GSM610/libgsm.la G72x/libg72x.la -lm
 
 test_file_io_CFLAGS = $(AM_CFLAGS)