diff --git a/build/jam/HaikuImage b/build/jam/HaikuImage
index 7f15a13c10..0e21371d6a 100644
--- a/build/jam/HaikuImage
+++ b/build/jam/HaikuImage
@@ -140,7 +140,7 @@ SYSTEM_ADD_ONS_MEDIA = cortex_audioadapter.media_addon
 	#legacy.media_addon
 ;
 SYSTEM_ADD_ONS_MEDIA_PLUGINS = $(GPL_ONLY)ac3_decoder
-	aiff_reader asf_reader au_reader avi_reader $(X86_ONLY)ffmpeg
+	aiff_reader asf_reader au_reader $(X86_ONLY)ffmpeg
 	mov_reader musepack ogg raw_decoder speex
 	$(X86_ONLY)ape_reader
 	# theora
diff --git a/src/add-ons/media/plugins/ffmpeg/DemuxerTable.cpp b/src/add-ons/media/plugins/ffmpeg/DemuxerTable.cpp
index af38d4f3a2..ec1dbdb46e 100644
--- a/src/add-ons/media/plugins/ffmpeg/DemuxerTable.cpp
+++ b/src/add-ons/media/plugins/ffmpeg/DemuxerTable.cpp
@@ -23,13 +23,12 @@ static const DemuxerFormat gDemuxerTable[] = {
 //		"asf", "ASF Movie", "video/x-asf",
 //		B_WAV_FORMAT_FAMILY, B_AVI_FORMAT_FAMILY
 //	},
-//	{
-//		// Tested with many streams and either works ok, or has inconsistent
-//		// seeking results for audio, i.e. often audio is not in sync.
-//		// Keep using the avi_reader implementation by Marcus Overhagen.
-//		"avi", "AVI (Audio Video Interleaved)", "video/x-msvideo",
-//		B_WAV_FORMAT_FAMILY, B_AVI_FORMAT_FAMILY
-//	},
+	{
+		// Tested with many streams and works very well, with many older
+		// files, the native AVI reader does not work.
+		"avi", "AVI (Audio Video Interleaved)", "video/x-msvideo",
+		B_WAV_FORMAT_FAMILY, B_AVI_FORMAT_FAMILY
+	},
 	{
 		"dv", "DV Movie", "video/dv",
 		B_WAV_FORMAT_FAMILY, B_QUICKTIME_FORMAT_FAMILY