diff --git a/ChangeLog b/ChangeLog
index e76bb37..97fa59c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2009-09-04  Götz Waschk  <waschk@mandriva.org>
+
+	* gstreamer-sharp/Makefile.am:
+	* gstreamer-sharp/baseplugins/Makefile.am:
+	* gstreamer-sharp/coreplugins/Makefile.am:
+	* source/Makefile.am: use the right variable for the mono runtime
+
 === release 0.9.0 ===
 
 2009-09-03  Sebastian Dröge <sebastian.droege@collabora.co.uk>
diff --git a/gstreamer-sharp/Makefile.am b/gstreamer-sharp/Makefile.am
index 3b733a9..d963d83 100644
--- a/gstreamer-sharp/Makefile.am
+++ b/gstreamer-sharp/Makefile.am
@@ -134,11 +134,11 @@ EXTRA_DIST =			\
 $(API): $(srcdir)/$(RAW_API) $(srcdir)/$(METADATA) $(srcdir)/$(SYMBOLS)
 	cp $(srcdir)/$(RAW_API) $(builddir)/$(API)
 	chmod u+w $(API)
-	$(MONO) $(top_builddir)/parser/gst-gapi-fixup.exe --api=$(builddir)/$(API) \
+	$(RUNTIME) $(top_builddir)/parser/gst-gapi-fixup.exe --api=$(builddir)/$(API) \
 		--metadata=$(srcdir)/$(METADATA) --symbols=$(srcdir)/$(SYMBOLS)
 
 generated-stamp: $(API) $(build_customs) $(overrides)
-	 $(MONO) $(top_builddir)/generator/gst-gapi_codegen.exe --generate $(builddir)/$(API) \
+	 $(RUNTIME) $(top_builddir)/generator/gst-gapi_codegen.exe --generate $(builddir)/$(API) \
 		--outdir=$(builddir)/generated --customdir=$(srcdir) --assembly-name=$(ASSEMBLY_NAME) \
 		--gluelib-name=gstreamersharpglue-0.10.dll --glue-filename=$(builddir)/glue/generated.c \
 		--glue-includes=$(glue_includes) \
diff --git a/gstreamer-sharp/baseplugins/Makefile.am b/gstreamer-sharp/baseplugins/Makefile.am
index 2a0f6fb..ab191ca 100644
--- a/gstreamer-sharp/baseplugins/Makefile.am
+++ b/gstreamer-sharp/baseplugins/Makefile.am
@@ -19,13 +19,13 @@ all: $(XML_FILES) $(CS_FILES)
 
 generated/%.cs: $(top_builddir)/elementgen/element-gen.exe $(top_builddir)/gstreamer-sharp/gstreamer-api.xml $(CUSTOM_FILES) $(builddir)/%.xml
 	@mkdir -p generated
-	$(MONO) $(top_builddir)/elementgen/element-gen.exe --namespace=$(NAMESPACE) \
+	$(RUNTIME) $(top_builddir)/elementgen/element-gen.exe --namespace=$(NAMESPACE) \
 		--api=$(top_builddir)/gstreamer-sharp/gstreamer-api.xml --input=$(patsubst generated/%.cs,$(builddir)/%.xml,$@) --customfile=$(patsubst generated/%.cs,$(srcdir)/%.custom,$@) --interfacesdir=$(top_srcdir)/elementgen/interfaces > $@
 
 %.xml: $(top_builddir)/parser/gst-gapi-fixup.exe $(srcdir)/inspect/%.raw $(srcdir)/%.metadata
 	cp $(patsubst %.xml,$(srcdir)/inspect/%.raw,$@) $(builddir)/$@
 	chmod +w $(builddir)/$@
-	$(MONO) $(top_builddir)/parser/gst-gapi-fixup.exe --api=$(builddir)/$@ --metadata=$(patsubst %.xml,$(srcdir)/%.metadata,$@)
+	$(RUNTIME) $(top_builddir)/parser/gst-gapi-fixup.exe --api=$(builddir)/$@ --metadata=$(patsubst %.xml,$(srcdir)/%.metadata,$@)
 
 %.xml: $(top_builddir)/parser/gst-gapi-fixup.exe $(srcdir)/inspect/%.raw 
 	cp $(patsubst %.xml,$(srcdir)/inspect/%.raw,$@) $(builddir)/$@
diff --git a/gstreamer-sharp/coreplugins/Makefile.am b/gstreamer-sharp/coreplugins/Makefile.am
index 7a45326..09b2aa1 100644
--- a/gstreamer-sharp/coreplugins/Makefile.am
+++ b/gstreamer-sharp/coreplugins/Makefile.am
@@ -24,13 +24,13 @@ all: $(XML_FILES) $(CS_FILES)
 
 generated/%.cs: $(top_builddir)/elementgen/element-gen.exe $(top_builddir)/gstreamer-sharp/gstreamer-api.xml $(CUSTOM_FILES) $(builddir)/%.xml
 	@mkdir -p generated
-	$(MONO) $(top_builddir)/elementgen/element-gen.exe --namespace=$(NAMESPACE) \
+	$(RUNTIME) $(top_builddir)/elementgen/element-gen.exe --namespace=$(NAMESPACE) \
 		--api=$(top_builddir)/gstreamer-sharp/gstreamer-api.xml --input=$(patsubst generated/%.cs,$(builddir)/%.xml,$@) --customfile=$(patsubst generated/%.cs,$(srcdir)/%.custom,$@) --interfacesdir=$(top_srcdir)/elementgen/interfaces > $@
 
 %.xml: $(top_builddir)/parser/gst-gapi-fixup.exe $(srcdir)/inspect/%.raw $(srcdir)/%.metadata
 	cp $(patsubst %.xml,$(srcdir)/inspect/%.raw,$@) $(builddir)/$@
 	chmod +w $(builddir)/$@
-	$(MONO) $(top_builddir)/parser/gst-gapi-fixup.exe --api=$(builddir)/$@ --metadata=$(patsubst %.xml,$(srcdir)/%.metadata,$@)
+	$(RUNTIME) $(top_builddir)/parser/gst-gapi-fixup.exe --api=$(builddir)/$@ --metadata=$(patsubst %.xml,$(srcdir)/%.metadata,$@)
 
 %.xml: $(top_builddir)/parser/gst-gapi-fixup.exe $(srcdir)/inspect/%.raw 
 	cp $(patsubst %.xml,$(srcdir)/inspect/%.raw,$@) $(builddir)/$@
diff --git a/source/Makefile.am b/source/Makefile.am
index 4b6e66b..32a982a 100644
--- a/source/Makefile.am
+++ b/source/Makefile.am
@@ -1,14 +1,14 @@
 MAINTAINERCLEANFILES = Makefile.in
 
 api:
-	$(MONO) $(top_builddir)/parser/gst-gapi-parser.exe \
+	$(RUNTIME) $(top_builddir)/parser/gst-gapi-parser.exe \
 		gstreamer-sharp-source.xml
 	grep -v "public const string " \
 		$(top_srcdir)/gstreamer-sharp/Tag.custom \
 		> $(top_srcdir)/gstreamer-sharp/Tag.custom.tmp
 	mv $(top_srcdir)/gstreamer-sharp/Tag.custom.tmp \
 		$(top_srcdir)/gstreamer-sharp/Tag.custom
-	$(MONO) $(top_builddir)/parser/gst-generate-tags.exe \
+	$(RUNTIME) $(top_builddir)/parser/gst-generate-tags.exe \
 		--header=../../gstreamer/gst/gsttaglist.h \
 		--namespace=Gst \
 		--class=Tags \
