diff --git a/ChangeLog b/ChangeLog
index 328cfd6d4..214f5d51e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2009-05-18  Stephane Delcroix  <sdelcroix@novell.com>
+
+	* configure.in.in:
+	* bootstrap-generic:
+	* bootstrap-2.14: check for mono >= 2.2. not that it requires it to
+	build, but the generated bindings need it to run.
+
 2009-05-13  Sebastian Dröge  <sebastian.droege@collabora.co.uk>
 
 	* glib/Value.cs: return int object value for GType.Enum values if
diff --git a/bootstrap-2.14 b/bootstrap-2.14
index 997b97743..896fcfcb2 100755
--- a/bootstrap-2.14
+++ b/bootstrap-2.14
@@ -6,6 +6,7 @@ ASSEMBLY_VERSION=2.14.0.0
 POLICY_VERSIONS="2.4 2.6 2.8 2.10 2.12"
 GTK_REQUIRED_VERSION=2.14.3
 GLIB_REQUIRED_VERSION=2.18.1
+MONO_REQUIRED_VERSION=2.2.0
 VERSIONCSDEFINES="-define:GTK_SHARP_2_6 -define:GTK_SHARP_2_8 -define:GTK_SHARP_2_10 -define:GTK_SHARP_2_12 -define:GTK_SHARP_2_14"
 VERSIONCFLAGS="-DGTK_SHARP_2_6 -DGTK_SHARP_2_8 -DGTK_SHARP_2_10 -DGTK_SHARP_2_12 -DGTK_SHARP_2_14"
 GTK_API_TAG=2.14
diff --git a/bootstrap-generic b/bootstrap-generic
index 97f803c20..bdb953a99 100755
--- a/bootstrap-generic
+++ b/bootstrap-generic
@@ -17,6 +17,7 @@ set -x
 sed -e "s/@GTK_SHARP_VERSION@/$GTK_SHARP_VERSION/" \
     -e "s/@GTK_REQUIRED_VERSION@/$GTK_REQUIRED_VERSION/" \
     -e "s/@GLIB_REQUIRED_VERSION@/$GLIB_REQUIRED_VERSION/" \
+    -e "s/@MONO_REQUIRED_VERSION@/$MONO_REQUIRED_VERSION/" \
     -e "s/@VERSIONCSDEFINES@/$VERSIONCSDEFINES/" \
     -e "s/@VERSIONCFLAGS@/$VERSIONCFLAGS/" \
     -e "s/@POLICY_VERSIONS@/$POLICY_VERSIONS/" \
diff --git a/configure.in.in b/configure.in.in
index f6e8064d2..ee83e24df 100644
--- a/configure.in.in
+++ b/configure.in.in
@@ -99,7 +99,7 @@ AC_CHECK_SIZEOF(off_t)
 OFF_T_FLAGS="-define:OFF_T_$ac_cv_sizeof_off_t"
 AC_SUBST(OFF_T_FLAGS)
 
-MONO_REQUIRED_VERSION=1.0
+MONO_REQUIRED_VERSION=@MONO_REQUIRED_VERSION@
 PKG_CHECK_MODULES(MONO_DEPENDENCY, mono >= $MONO_REQUIRED_VERSION, has_mono=true, has_mono=false)
 
 AC_PATH_PROG(GACUTIL, gacutil, no)
@@ -143,7 +143,7 @@ GENERATED_SOURCES=generated\\\\*.cs
 enable_dotnet=yes
 
 if test x$CSC = "xno"; then
-	AC_MSG_ERROR([You need to install either mono or .Net])
+	AC_MSG_ERROR([You need to install either mono (>=$MONO_REQUIRED_VERSION) or .Net])
 else
 RUNTIME=
 LIB_PREFIX=