diff --git a/ChangeLog b/ChangeLog
index 6487b08948..ba4507c53f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2006-01-30  Sebastien Moutte  <sebastien@moutte.net>
+	
+	* win32/vs6/grammar.dsp:
+		add autogen of gstmarshal.c,h for Release mode
+		
 2006-01-30  Wim Taymans  <wim@fluendo.com>
 
 	* libs/gst/base/gstbasesink.c: (gst_base_sink_init),
diff --git a/win32/vs6/grammar.dsp b/win32/vs6/grammar.dsp
index a2901306d5..b6c8e9f860 100644
--- a/win32/vs6/grammar.dsp
+++ b/win32/vs6/grammar.dsp
@@ -182,6 +182,25 @@ BuildCmds= \
 SOURCE=..\..\gst\gstmarshal.list
 
 !IF  "$(CFG)" == "grammar - Win32 Release"
+# Begin Custom Build
+InputPath=..\..\gst\gstmarshal.list
+
+BuildCmds= \
+	echo #include "glib-object.h" > gstmarshal.c.tmp \
+	echo #include "gstmarshal.h" >> gstmarshal.c.tmp \
+	glib-genmarshal --body --prefix=gst_marshal ..\..\gst\gstmarshal.list >> gstmarshal.c.tmp \
+	move gstmarshal.c.tmp ..\..\gst\gstmarshal.c \
+	echo #include "gst/gstconfig.h" > gstmarshal.h.tmp \
+	glib-genmarshal --header --prefix=gst_marshal ..\..\gst\gstmarshal.list >> gstmarshal.h.tmp \
+	move gstmarshal.h.tmp ..\..\gst\gstmarshal.h \
+	
+
+"..\..\gst\gstmarshal.c" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+   $(BuildCmds)
+
+"..\..\gst\gstmarshal.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+   $(BuildCmds)
+# End Custom Build
 
 !ELSEIF  "$(CFG)" == "grammar - Win32 Debug"