diff --git a/ChangeLog b/ChangeLog
index 1a326a46f..3c48788d8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -7,6 +7,13 @@
 
 2008-06-02	Tobias Doerffel	<tobydox/at/users/dot/sourceforge/dot/net>
 
+	* src/core/mixer.cpp:
+	try all audio-drivers at startup even if dummy-driver is selected
+
+	* configure.in:
+	* Makefile.am:
+	properly link against win32-libsndfile
+
 	* plugins/patman/patman.cpp:
 	* plugins/patman/Makefile.am:
 	* plugins/ladspa_effect/ladspa_effect.cpp:
diff --git a/src/core/mixer.cpp b/src/core/mixer.cpp
index 0919a30ef..cc52dc903 100644
--- a/src/core/mixer.cpp
+++ b/src/core/mixer.cpp
@@ -899,6 +899,11 @@ audioDevice * mixer::tryAudioDevices( void )
 	audioDevice * dev = NULL;
 	QString dev_name = configManager::inst()->value( "mixer", "audiodev" );
 
+	if( dev_name == audioDummy::name() )
+	{
+		dev_name = "";
+	}
+
 #ifdef ALSA_SUPPORT
 	if( dev_name == audioALSA::name() || dev_name == "" )
 	{