diff --git a/gst/avi/avi.def b/gst/avi/avi.def
new file mode 100644
index 0000000000..caae1c0ac6
--- /dev/null
+++ b/gst/avi/avi.def
@@ -0,0 +1,2 @@
+EXPORTS
+    gst_plugin_desc
diff --git a/gst/avi/avi.vcproj b/gst/avi/avi.vcproj
new file mode 100644
index 0000000000..75b1235a8e
--- /dev/null
+++ b/gst/avi/avi.vcproj
@@ -0,0 +1,163 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+	ProjectType="Visual C++"
+	Version="7.10"
+	Name="avi"
+	ProjectGUID="{979C216F-0ACF-4956-AE00-055A42D67892}"
+	Keyword="Win32Proj">
+	<Platforms>
+		<Platform
+			Name="Win32"/>
+	</Platforms>
+	<Configurations>
+		<Configuration
+			Name="Debug|Win32"
+			OutputDirectory="../../win32/Debug"
+			IntermediateDirectory="../../win32/Debug"
+			ConfigurationType="2"
+			CharacterSet="2">
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				AdditionalIncludeDirectories="../../../gstreamer/win32;../../../gstreamer;../../../gstreamer/libs;../../../glib;../../../glib/glib;../../../glib/gmodule;&quot;../../gst-libs&quot;;../../../popt/include;../../../libxml2/include/libxml2"
+				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;AVI_EXPORTS;HAVE_CONFIG_H"
+				MinimalRebuild="TRUE"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="3"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				Detect64BitPortabilityProblems="TRUE"
+				DebugInformationFormat="4"/>
+			<Tool
+				Name="VCCustomBuildTool"/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="glib-2.0.lib gmodule-2.0.lib gthread-2.0.lib gobject-2.0.lib GStreamer-0.8.lib gstbytestream.lib iconv.lib intl.lib"
+				OutputFile="$(OutDir)/gstavi.dll"
+				LinkIncremental="2"
+				AdditionalLibraryDirectories="../../../gstreamer/win32/Debug;../../../glib/glib;../../../glib/gmodule;../../../glib/gthread;../../../glib/gobject;../../../gettext/lib;../../../libiconv/lib"
+				ModuleDefinitionFile="avi.def"
+				GenerateDebugInformation="TRUE"
+				ProgramDatabaseFile="$(OutDir)/avi.pdb"
+				SubSystem="2"
+				OptimizeReferences="2"
+				ImportLibrary="$(OutDir)/gstavi.lib"
+				TargetMachine="1"/>
+			<Tool
+				Name="VCMIDLTool"/>
+			<Tool
+				Name="VCPostBuildEventTool"
+				CommandLine="copy /Y $(TargetPath) c:\gstreamer\plugins"/>
+			<Tool
+				Name="VCPreBuildEventTool"/>
+			<Tool
+				Name="VCPreLinkEventTool"/>
+			<Tool
+				Name="VCResourceCompilerTool"/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"/>
+			<Tool
+				Name="VCWebDeploymentTool"/>
+			<Tool
+				Name="VCManagedWrapperGeneratorTool"/>
+			<Tool
+				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+		</Configuration>
+		<Configuration
+			Name="Release|Win32"
+			OutputDirectory="../../win32/Release"
+			IntermediateDirectory="../../win32/Release"
+			ConfigurationType="2"
+			CharacterSet="2">
+			<Tool
+				Name="VCCLCompilerTool"
+				AdditionalIncludeDirectories="../../../gstreamer/win32;../../../gstreamer;../../../gstreamer/libs;../../../glib;../../../glib/glib;../../../glib/gmodule;&quot;../../gst-libs&quot;;../../../popt/include;../../../libxml2/include/libxml2"
+				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;AVI_EXPORTS;HAVE_CONFIG_H"
+				RuntimeLibrary="2"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				Detect64BitPortabilityProblems="TRUE"
+				DebugInformationFormat="3"/>
+			<Tool
+				Name="VCCustomBuildTool"/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="glib-2.0.lib gmodule-2.0.lib gthread-2.0.lib gobject-2.0.lib GStreamer-0.8.lib gstbytestream.lib iconv.lib intl.lib"
+				OutputFile="$(OutDir)/gstavi.dll"
+				LinkIncremental="1"
+				AdditionalLibraryDirectories="../../../gstreamer/win32/Debug;../../../glib/glib;../../../glib/gmodule;../../../glib/gthread;../../../glib/gobject;../../../gettext/lib;../../../libiconv/lib"
+				ModuleDefinitionFile="avi.def"
+				GenerateDebugInformation="TRUE"
+				SubSystem="2"
+				OptimizeReferences="2"
+				EnableCOMDATFolding="2"
+				ImportLibrary="$(OutDir)/gstavi.lib"
+				TargetMachine="1"/>
+			<Tool
+				Name="VCMIDLTool"/>
+			<Tool
+				Name="VCPostBuildEventTool"
+				CommandLine="copy /Y $(TargetPath) c:\gstreamer\plugins"/>
+			<Tool
+				Name="VCPreBuildEventTool"/>
+			<Tool
+				Name="VCPreLinkEventTool"/>
+			<Tool
+				Name="VCResourceCompilerTool"/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"/>
+			<Tool
+				Name="VCWebDeploymentTool"/>
+			<Tool
+				Name="VCManagedWrapperGeneratorTool"/>
+			<Tool
+				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+		</Configuration>
+	</Configurations>
+	<References>
+	</References>
+	<Files>
+		<Filter
+			Name="Source Files"
+			Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx"
+			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}">
+			<File
+				RelativePath=".\avi.def">
+			</File>
+			<File
+				RelativePath=".\gstavi.c">
+			</File>
+			<File
+				RelativePath=".\gstavidemux.c">
+			</File>
+			<File
+				RelativePath=".\gstavimux.c">
+			</File>
+		</Filter>
+		<Filter
+			Name="Header Files"
+			Filter="h;hpp;hxx;hm;inl;inc;xsd"
+			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}">
+			<File
+				RelativePath=".\avi-ids.h">
+			</File>
+			<File
+				RelativePath=".\gstavidemux.h">
+			</File>
+			<File
+				RelativePath=".\gstavimux.h">
+			</File>
+		</Filter>
+		<Filter
+			Name="Resource Files"
+			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx"
+			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}">
+		</Filter>
+	</Files>
+	<Globals>
+	</Globals>
+</VisualStudioProject>
diff --git a/gst/matroska/matroska.vcproj b/gst/matroska/matroska.vcproj
index 6dae909766..348bf2ad12 100644
--- a/gst/matroska/matroska.vcproj
+++ b/gst/matroska/matroska.vcproj
@@ -46,7 +46,8 @@
 			<Tool
 				Name="VCMIDLTool"/>
 			<Tool
-				Name="VCPostBuildEventTool"/>
+				Name="VCPostBuildEventTool"
+				CommandLine="copy /Y $(TargetPath) c:\gstreamer\plugins"/>
 			<Tool
 				Name="VCPreBuildEventTool"/>
 			<Tool
@@ -84,7 +85,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="glib-2.0.lib gmodule-2.0.lib gthread-2.0.lib gobject-2.0.lib GStreamer-0.8.lib gstbytestream.lib iconv.lib intl.lib"
-				OutputFile="$(OutDir)/matroska.dll"
+				OutputFile="$(OutDir)/gstmatroska.dll"
 				LinkIncremental="1"
 				AdditionalLibraryDirectories="../../../gstreamer/win32/Debug;../../../glib/glib;../../../glib/gmodule;../../../glib/gthread;../../../glib/gobject;../../../gettext/lib;../../../libiconv/lib"
 				ModuleDefinitionFile="matroska.def"
@@ -97,7 +98,8 @@
 			<Tool
 				Name="VCMIDLTool"/>
 			<Tool
-				Name="VCPostBuildEventTool"/>
+				Name="VCPostBuildEventTool"
+				CommandLine="copy /Y $(TargetPath) c:\gstreamer\plugins"/>
 			<Tool
 				Name="VCPreBuildEventTool"/>
 			<Tool
@@ -138,6 +140,9 @@
 			<File
 				RelativePath=".\matroska.c">
 			</File>
+			<File
+				RelativePath=".\matroska.def">
+			</File>
 		</Filter>
 		<Filter
 			Name="Header Files"
diff --git a/win32/gst.sln b/win32/gst.sln
index 439234e826..c42712d81e 100644
--- a/win32/gst.sln
+++ b/win32/gst.sln
@@ -4,7 +4,20 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "matroska", "..\gst\matroska
 		{979C216F-0ACF-4956-AE00-055A42D67890} = {979C216F-0ACF-4956-AE00-055A42D67890}
 	EndProjectSection
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libs", "..\gst-libs\gst\gst-libs.vcproj", "{979C216F-0ACF-4956-AE00-055A42D67890}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "avi", "..\gst\avi\avi.vcproj", "{979C216F-0ACF-4956-AE00-055A42D67892}"
+	ProjectSection(ProjectDependencies) = postProject
+		{979C216F-0ACF-4956-AE00-055A42D67890} = {979C216F-0ACF-4956-AE00-055A42D67890}
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "audio", "..\gst-libs\gst\audio\audio.vcproj", "{979C216F-0ACF-4956-AE00-055A42D67893}"
+	ProjectSection(ProjectDependencies) = postProject
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "riff", "..\gst-libs\gst\riff\riff.vcproj", "{979C216F-0ACF-4956-AE00-055A42D67890}"
+	ProjectSection(ProjectDependencies) = postProject
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "audiofilter", "..\gst-libs\gst\audio\audiofilter.vcproj", "{979C216F-0ACF-4956-AE00-055A42D67894}"
 	ProjectSection(ProjectDependencies) = postProject
 	EndProjectSection
 EndProject
@@ -18,10 +31,22 @@ Global
 		{979C216F-0ACF-4956-AE00-055A42D67891}.Debug.Build.0 = Debug|Win32
 		{979C216F-0ACF-4956-AE00-055A42D67891}.Release.ActiveCfg = Release|Win32
 		{979C216F-0ACF-4956-AE00-055A42D67891}.Release.Build.0 = Release|Win32
+		{979C216F-0ACF-4956-AE00-055A42D67892}.Debug.ActiveCfg = Debug|Win32
+		{979C216F-0ACF-4956-AE00-055A42D67892}.Debug.Build.0 = Debug|Win32
+		{979C216F-0ACF-4956-AE00-055A42D67892}.Release.ActiveCfg = Release|Win32
+		{979C216F-0ACF-4956-AE00-055A42D67892}.Release.Build.0 = Release|Win32
+		{979C216F-0ACF-4956-AE00-055A42D67893}.Debug.ActiveCfg = Debug|Win32
+		{979C216F-0ACF-4956-AE00-055A42D67893}.Debug.Build.0 = Debug|Win32
+		{979C216F-0ACF-4956-AE00-055A42D67893}.Release.ActiveCfg = Release|Win32
+		{979C216F-0ACF-4956-AE00-055A42D67893}.Release.Build.0 = Release|Win32
 		{979C216F-0ACF-4956-AE00-055A42D67890}.Debug.ActiveCfg = Debug|Win32
 		{979C216F-0ACF-4956-AE00-055A42D67890}.Debug.Build.0 = Debug|Win32
 		{979C216F-0ACF-4956-AE00-055A42D67890}.Release.ActiveCfg = Release|Win32
 		{979C216F-0ACF-4956-AE00-055A42D67890}.Release.Build.0 = Release|Win32
+		{979C216F-0ACF-4956-AE00-055A42D67894}.Debug.ActiveCfg = Debug|Win32
+		{979C216F-0ACF-4956-AE00-055A42D67894}.Debug.Build.0 = Debug|Win32
+		{979C216F-0ACF-4956-AE00-055A42D67894}.Release.ActiveCfg = Release|Win32
+		{979C216F-0ACF-4956-AE00-055A42D67894}.Release.Build.0 = Release|Win32
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 	EndGlobalSection