diff --git a/configure b/configure
index 5edbca1867..0510e4dd22 100755
--- a/configure
+++ b/configure
@@ -127,7 +127,7 @@ AWKCOMMAND='
 		if ($0 == "WINCE"       && "'$os'" != "WINCE")             { next; }
 		if ($0 == "MSVC"        && "'$os'" != "MSVC")              { next; }
 		if ($0 == "DIRECTMUSIC" && "'$with_direct_music'" == "0")  { next; }
-		if ($0 == "LIBTIMIDITY" && "'$libtimidity'" == "" )        { next; }
+		if ($0 == "LIBTIMIDITY" && "'$libtimidity_config'" == "" ) { next; }
 		if ($0 == "HAVE_THREAD" && "'$with_threads'" == "0")       { next; }
 		if ($0 == "SSE"         && "'$with_sse'" != "1")           { next; }
 
diff --git a/source.list b/source.list
index 890185fc83..f7c8096d57 100644
--- a/source.list
+++ b/source.list
@@ -1123,7 +1123,10 @@ music/null_m.cpp
 			#else
 				#if MORPHOS
 				#else
-					music/extmidi.cpp
+					#if LIBTIMIDITY
+					#else
+						music/extmidi.cpp
+					#end
 				#end
 			#end
 		#end