diff --git a/ChangeLog b/ChangeLog
index 34f6d99850..cfce5c323e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2004-08-16  Steve Lhomme  <steve.lhomme@free.fr>
+
+	* win32/GStreamer.vcproj:
+	  temporary local files are .gmo not .mo
+
 2004-08-16  Thomas Vander Stichele  <thomas at apestaart dot org>
 
 	* configure.ac: bump nano to cvs
diff --git a/Makefile.am b/Makefile.am
index aa4111ecb7..5c2a8b08b3 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -45,7 +45,8 @@ DIST_SUBDIRS = \
 	pkgconfig \
 	po \
 	common \
-	docs
+	docs \
+	win32
 
 win32 = $(shell cat $(top_srcdir)/win32/MANIFEST)
 
diff --git a/win32/GStreamer.vcproj b/win32/GStreamer.vcproj
index 21a66ecdad..090382c60d 100644
--- a/win32/GStreamer.vcproj
+++ b/win32/GStreamer.vcproj
@@ -60,9 +60,9 @@
 mkdir c:\gstreamer
 mkdir c:\gstreamer\bin
 copy /Y $(TargetPath) c:\gstreamer\bin
-for %%i in (af az ca cs en_GB fr nl sq sr sv tr uk) do msgfmt -o ..\po\%%i.mo ..\po\%%i.po
+for %%i in (af az ca cs en_GB fr nl sq sr sv tr uk) do msgfmt -o ..\po\%%i.gmo ..\po\%%i.po
 for %%i in (af az ca cs en_GB fr nl sq sr sv tr uk) do mkdir c:\gstreamer\locale\%%i
-for %%i in (af az ca cs en_GB fr nl sq sr sv tr uk) do copy /Y ..\po\%%i.mo c:\gstreamer\locale\%%i\gstreamer-0.8.mo"/>
+for %%i in (af az ca cs en_GB fr nl sq sr sv tr uk) do copy /Y ..\po\%%i.gmo c:\gstreamer\locale\%%i\gstreamer-0.8.mo"/>
 			<Tool
 				Name="VCPreBuildEventTool"
 				CommandLine="copy $(ProjectDir)\gstconfig.h $(ProjectDir)\..\gst\gstconfig.h
@@ -140,9 +140,9 @@ type gstreamer-dbg.def &gt;&gt; gst.def
 mkdir c:\gstreamer
 mkdir c:\gstreamer\bin
 copy /Y $(TargetPath) c:\gstreamer\bin
-for %%i in (af az ca cs en_GB fr nl sq sr sv tr uk) do msgfmt -o ..\po\%%i.mo ..\po\%%i.po
+for %%i in (af az ca cs en_GB fr nl sq sr sv tr uk) do msgfmt -o ..\po\%%i.gmo ..\po\%%i.po
 for %%i in (af az ca cs en_GB fr nl sq sr sv tr uk) do mkdir c:\gstreamer\locale\%%i
-for %%i in (af az ca cs en_GB fr nl sq sr sv tr uk) do copy /Y ..\po\%%i.mo c:\gstreamer\locale\%%i\gstreamer-0.8.mo"/>
+for %%i in (af az ca cs en_GB fr nl sq sr sv tr uk) do copy /Y ..\po\%%i.gmo c:\gstreamer\locale\%%i\gstreamer-0.8.mo"/>
 			<Tool
 				Name="VCPreBuildEventTool"
 				CommandLine="copy $(ProjectDir)\gstconfig.h $(ProjectDir)\..\gst\gstconfig.h
diff --git a/win32/vs7/GStreamer.vcproj b/win32/vs7/GStreamer.vcproj
index 21a66ecdad..090382c60d 100644
--- a/win32/vs7/GStreamer.vcproj
+++ b/win32/vs7/GStreamer.vcproj
@@ -60,9 +60,9 @@
 mkdir c:\gstreamer
 mkdir c:\gstreamer\bin
 copy /Y $(TargetPath) c:\gstreamer\bin
-for %%i in (af az ca cs en_GB fr nl sq sr sv tr uk) do msgfmt -o ..\po\%%i.mo ..\po\%%i.po
+for %%i in (af az ca cs en_GB fr nl sq sr sv tr uk) do msgfmt -o ..\po\%%i.gmo ..\po\%%i.po
 for %%i in (af az ca cs en_GB fr nl sq sr sv tr uk) do mkdir c:\gstreamer\locale\%%i
-for %%i in (af az ca cs en_GB fr nl sq sr sv tr uk) do copy /Y ..\po\%%i.mo c:\gstreamer\locale\%%i\gstreamer-0.8.mo"/>
+for %%i in (af az ca cs en_GB fr nl sq sr sv tr uk) do copy /Y ..\po\%%i.gmo c:\gstreamer\locale\%%i\gstreamer-0.8.mo"/>
 			<Tool
 				Name="VCPreBuildEventTool"
 				CommandLine="copy $(ProjectDir)\gstconfig.h $(ProjectDir)\..\gst\gstconfig.h
@@ -140,9 +140,9 @@ type gstreamer-dbg.def &gt;&gt; gst.def
 mkdir c:\gstreamer
 mkdir c:\gstreamer\bin
 copy /Y $(TargetPath) c:\gstreamer\bin
-for %%i in (af az ca cs en_GB fr nl sq sr sv tr uk) do msgfmt -o ..\po\%%i.mo ..\po\%%i.po
+for %%i in (af az ca cs en_GB fr nl sq sr sv tr uk) do msgfmt -o ..\po\%%i.gmo ..\po\%%i.po
 for %%i in (af az ca cs en_GB fr nl sq sr sv tr uk) do mkdir c:\gstreamer\locale\%%i
-for %%i in (af az ca cs en_GB fr nl sq sr sv tr uk) do copy /Y ..\po\%%i.mo c:\gstreamer\locale\%%i\gstreamer-0.8.mo"/>
+for %%i in (af az ca cs en_GB fr nl sq sr sv tr uk) do copy /Y ..\po\%%i.gmo c:\gstreamer\locale\%%i\gstreamer-0.8.mo"/>
 			<Tool
 				Name="VCPreBuildEventTool"
 				CommandLine="copy $(ProjectDir)\gstconfig.h $(ProjectDir)\..\gst\gstconfig.h