diff --git a/ChangeLog b/ChangeLog
index 8a5d8fd528..26771726e1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2007-05-09  Sebastien Moutte  <sebastien@moutte.net>
+
+	* win32/common/libgstreamer.def:
+	Add new exported functions.
+	* win32/vs6/grammar.dsp:
+	Use grammar pre-generated files.
+
 2007-05-09  Tim-Philipp Müller  <tim at centricular dot net>
 
 	Based on patch by: Peter Kjellerstedt  <pkj at axis com>
diff --git a/common b/common
index 61edc2dc7b..a6e41a42ec 160000
--- a/common
+++ b/common
@@ -1 +1 @@
-Subproject commit 61edc2dc7b8eba179d85a6545e46e0d65239e94d
+Subproject commit a6e41a42ec1b93fddbd14b2e5af87e2d456b8962
diff --git a/win32/common/libgstreamer.def b/win32/common/libgstreamer.def
index 39382a17b5..46a711be72 100644
--- a/win32/common/libgstreamer.def
+++ b/win32/common/libgstreamer.def
@@ -331,6 +331,8 @@ EXPORTS
 	gst_message_get_structure
 	gst_message_get_type
 	gst_message_new_application
+	gst_message_new_async_done
+	gst_message_new_async_start
 	gst_message_new_buffering
 	gst_message_new_clock_lost
 	gst_message_new_clock_provide
diff --git a/win32/vs6/grammar.dsp b/win32/vs6/grammar.dsp
index b6c8e9f860..4ffa74fe35 100644
--- a/win32/vs6/grammar.dsp
+++ b/win32/vs6/grammar.dsp
@@ -69,8 +69,9 @@ SOURCE=..\..\gst\parse\grammar.y
 InputPath=..\..\gst\parse\grammar.y
 
 BuildCmds= \
-	bison -d -v -p_gst_parse__yy ..\..\gst\parse\grammar.y -o ..\..\gst\parse\grammar.tab.c \
-	flex -P_gst_parse_yy -o..\..\gst\parse\lex._gst_parse_yy.c ..\..\gst\parse\parse.l \
+	copy /y ..\..\gst\parse\grammar.tab.pre.c ..\..\gst\parse\grammar.tab.c \
+	copy /y ..\..\gst\parse\grammar.tab.pre.h ..\..\gst\parse\grammar.tab.h \
+	copy /y ..\..\gst\parse\lex._gst_parse_yy.pre.c ..\..\gst\parse\lex._gst_parse_yy.c \
 	
 
 "..\..\gst\parse\lex._gst_parse_yy.c" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
@@ -89,8 +90,9 @@ BuildCmds= \
 InputPath=..\..\gst\parse\grammar.y
 
 BuildCmds= \
-	bison -d -v -p_gst_parse__yy ..\..\gst\parse\grammar.y -o ..\..\gst\parse\grammar.tab.c \
-	flex -P_gst_parse_yy -o..\..\gst\parse\lex._gst_parse_yy.c ..\..\gst\parse\parse.l \
+	copy /y ..\..\gst\parse\grammar.tab.pre.c ..\..\gst\parse\grammar.tab.c \
+	copy /y ..\..\gst\parse\grammar.tab.pre.h ..\..\gst\parse\grammar.tab.h \
+	copy /y ..\..\gst\parse\lex._gst_parse_yy.pre.c ..\..\gst\parse\lex._gst_parse_yy.c \
 	
 
 "..\..\gst\parse\lex._gst_parse_yy.c" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
@@ -116,6 +118,7 @@ SOURCE=..\..\gst\gst.h
 SOURCE=..\common\gstconfig.h
 
 !IF  "$(CFG)" == "grammar - Win32 Release"
+
 # Begin Custom Build
 InputPath=..\common\gstconfig.h
 
@@ -123,6 +126,7 @@ InputPath=..\common\gstconfig.h
 	copy /y ..\common\gstconfig.h ..\..\gst
 
 # End Custom Build
+
 !ELSEIF  "$(CFG)" == "grammar - Win32 Debug"
 
 # Begin Custom Build
@@ -182,6 +186,7 @@ BuildCmds= \
 SOURCE=..\..\gst\gstmarshal.list
 
 !IF  "$(CFG)" == "grammar - Win32 Release"
+
 # Begin Custom Build
 InputPath=..\..\gst\gstmarshal.list