diff --git a/src/plugins/grass/modules/db.in.ogr.qgm b/src/plugins/grass/modules/db.in.ogr.qgm
index 16b9f473a257..9bbb042e1d28 100644
--- a/src/plugins/grass/modules/db.in.ogr.qgm
+++ b/src/plugins/grass/modules/db.in.ogr.qgm
@@ -2,6 +2,7 @@
 <!DOCTYPE qgisgrassmodule SYSTEM "http://mrcc.com/qgisgrassmodule.dtd">
 
 <qgisgrassmodule label="Import attribute tables in various formats" module="db.in.ogr">
-	<file key="dsn" type="old" label="Input table" filters="dbf, csv (*.csv *.dbf)" />
+	<file key="dsn" type="old" label="Input table" filters="dbf, csv (*.csv *.dbf)" version_max="6.4"/>
+	<file key="input" type="old" label="Input table" filters="dbf, csv (*.csv *.dbf)" version_min="7.0"/>
 	<option key="output"/>
 </qgisgrassmodule>
diff --git a/src/plugins/grass/modules/db.out.ogr.qgm b/src/plugins/grass/modules/db.out.ogr.qgm
index 14133c611bbe..93e960239eae 100644
--- a/src/plugins/grass/modules/db.out.ogr.qgm
+++ b/src/plugins/grass/modules/db.out.ogr.qgm
@@ -3,7 +3,9 @@
 
 <qgisgrassmodule label="Exports attribute tables into various format" module="db.out.ogr">
 	<option key="input" />
-	<file key="dsn" type="new" />
+	<file key="dsn" type="new" version_max="6.4"/>
+	<file key="output" type="new" version_max="7.0"/>
 	<option key="format" />
-	<option key="db_table" />
+	<option key="db_table" version_max="6.4"/>
+	<option key="table" version_min="7.0"/>
 </qgisgrassmodule>
diff --git a/src/plugins/grass/modules/default.qgc b/src/plugins/grass/modules/default.qgc
index b3e31b1915fb..fa73fd39ea39 100644
--- a/src/plugins/grass/modules/default.qgc
+++ b/src/plugins/grass/modules/default.qgc
@@ -41,7 +41,7 @@
 					<grass name="r.in.ascii"/>
 					<grass name="r.in.poly"/>
 					<grass name="r.in.bin"/>
-					<grass name="r.in.arc"/>
+					<grass name="r.in.arc" version_max="6.4"/>
 					<grass name="r.in.gridatb"/>
 					<grass name="r.in.mat"/>
 					<grass name="i.in.spotvgt"/>
@@ -61,10 +61,10 @@
 					<grass name="v.in.ascii"/>
 					<grass name="v.in.mapgen"/>
 					<grass name="v.in.db"/>
-					<grass name="v.in.garmin"/>
-					<grass name="v.in.gpsbabel"/>
+					<grass name="v.in.garmin" version_max="6.4"/>
+					<grass name="v.in.gpsbabel" version_max="6.4"/>
 					<grass name="v.in.geonames" version_min="6.4"/>
-					<grass name="v.in.gns"/>
+					<grass name="v.in.gns" version_max="6.4"/>
 			</section>
 			<section label="Import from database into GRASS">
 				<grass name="db.in.ogr"/>
@@ -76,7 +76,7 @@
 				<grass name="r.out.gdal"/>
 				<grass name="r.out.ascii"/>
 				<grass name="r.out.xyz"/>
-				<grass name="r.out.arc"/>
+				<grass name="r.out.arc" version_max="6.4"/>
 				<grass name="r.out.gridatb"/>
 				<grass name="r.out.mat"/>
 				<grass name="r.out.bin"/>
@@ -85,7 +85,7 @@
 				<grass name="r.out.ppm"/>
 				<grass name="r.out.ppm3"/>
 				<grass name="r.out.pov"/>
-				<grass name="r.out.tiff"/>
+				<grass name="r.out.tiff" version_max="6.4"/>
 				<grass name="r.out.vrml"/>
 				<grass name="r.out.vtk"/>
 			</section>
diff --git a/src/plugins/grass/modules/g.region.multiple.raster.qgm b/src/plugins/grass/modules/g.region.multiple.raster.qgm
index d6c05458e9ea..58e6faa245d8 100644
--- a/src/plugins/grass/modules/g.region.multiple.raster.qgm
+++ b/src/plugins/grass/modules/g.region.multiple.raster.qgm
@@ -2,5 +2,6 @@
 <!DOCTYPE qgisgrassmodule SYSTEM "http://mrcc.com/qgisgrassmodule.dtd">
 
 <qgisgrassmodule label="Set the region to match multiple rasters" module="g.region">
-	<file key="rast" label="Type in map names separated by a comma" />
+	<file key="rast" label="Type in map names separated by a comma" version_max="6.4"/>
+	<file key="raster" label="Type in map names separated by a comma" version_min="7.0"/>
 </qgisgrassmodule>
diff --git a/src/plugins/grass/modules/g.region.multiple.vector.qgm b/src/plugins/grass/modules/g.region.multiple.vector.qgm
index 49c31929b232..5b07c14108db 100644
--- a/src/plugins/grass/modules/g.region.multiple.vector.qgm
+++ b/src/plugins/grass/modules/g.region.multiple.vector.qgm
@@ -2,5 +2,6 @@
 <!DOCTYPE qgisgrassmodule SYSTEM "http://mrcc.com/qgisgrassmodule.dtd">
 
 <qgisgrassmodule label="Set the region to match multiple vectors" module="g.region">
-	<file key="vect" label="Type in map names separated by a comma" />
+	<file key="vect" label="Type in map names separated by a comma" version_max="6.4"/>
+	<file key="vector" label="Type in map names separated by a comma" version_min="7.0"/>
 </qgisgrassmodule>
diff --git a/src/plugins/grass/modules/i.in.spotvgt.qgm b/src/plugins/grass/modules/i.in.spotvgt.qgm
index 9f4c45b9f42b..0788edd11e56 100644
--- a/src/plugins/grass/modules/i.in.spotvgt.qgm
+++ b/src/plugins/grass/modules/i.in.spotvgt.qgm
@@ -2,7 +2,9 @@
 <!DOCTYPE qgisgrassmodule SYSTEM "http://mrcc.com/qgisgrassmodule.dtd">
 
 <qgisgrassmodule label="Import SPOT VGT NDVI" module="i.in.spotvgt">
-	<file key="file" type="new" />
+	<file key="file" type="new" version_max="6.4"/>
+	<file key="input" version_min="7.0"/>
 	<flag key="a" />
-	<option key="rast" />
+	<option key="rast" version_max="6.4"/>
+	<option key="output" version_min="7.0"/>
 </qgisgrassmodule>
diff --git a/src/plugins/grass/modules/r.external.all.qgm b/src/plugins/grass/modules/r.external.all.qgm
index d21d120a6f49..025c4d961fc8 100644
--- a/src/plugins/grass/modules/r.external.all.qgm
+++ b/src/plugins/grass/modules/r.external.all.qgm
@@ -2,7 +2,6 @@
 <!DOCTYPE qgisgrassmodule SYSTEM "http://mrcc.com/qgisgrassdatamodule.dtd">
 <qgisgrassmodule label="Link all GDAL supported rasters in a directory as GRASS rasters" module="r.external.all.py" manual="r.external">
 	<file key="input" type="directory" label="Directory of rasters to be linked"/>
-	<option key="title" advanced="yes"/>
 	<option key="band" advanced="yes"/>
 	<flag key="r" advanced="yes"/>
 	<flag key="o" advanced="yes"/>
diff --git a/src/plugins/grass/modules/r.in.ascii.qgm b/src/plugins/grass/modules/r.in.ascii.qgm
index c2bb2f1ef6a7..3b9b94c3a100 100644
--- a/src/plugins/grass/modules/r.in.ascii.qgm
+++ b/src/plugins/grass/modules/r.in.ascii.qgm
@@ -3,11 +3,14 @@
 
 <qgisgrassmodule label="Import ASCII raster" module="r.in.ascii">
 	<file key="input" type="old" />
-	<option key="mult" />
-	<option key="nv" />
-	<flag key="i" />
-	<flag key="f" />
-	<flag key="d" />
+	<option key="mult" version_max="6.4" />
+	<option key="multiplier" version_min="7.0" />
+	<option key="nv" version_max="6.4" />
+	<option key="null_value" version_min="7.0" />
+	<option key="type" version_min="7.0" />
+	<flag key="i" version_max="6.4" />
+	<flag key="f" version_max="6.4" />
+	<flag key="d" version_max="6.4" />
 	<flag key="s" />
 	<option key="output" />
 </qgisgrassmodule>
diff --git a/src/plugins/grass/modules/r.in.wms.qgm b/src/plugins/grass/modules/r.in.wms.qgm
index 45e029c426da..22be6f81e65e 100644
--- a/src/plugins/grass/modules/r.in.wms.qgm
+++ b/src/plugins/grass/modules/r.in.wms.qgm
@@ -2,18 +2,29 @@
 <!DOCTYPE qgisgrassmodule SYSTEM "http://mrcc.com/qgisgrassmodule.dtd">
 
 <qgisgrassmodule label="Download and import data from WMS server" module="r.in.wms">
-	<option key="mapserver" />
+	<option key="mapserver" version_max="6.4"/>
+	<option key="url" version_min="7.0"/>
 	<option key="layers" />
 	<option key="srs" />
 	<option key="format" />
-	<option key="wmsquery" />
-	<flag key="d" answer="off" />
+	<option key="wms_version" version_min="7.0"/>
+	<option key="wmsquery" version_max="6.4"/>
+	<flag key="d" answer="off" version_max="6.4"/>
 	<flag key="c" answer="off" />
-	<option key="folder" />
-	<option key="wgetoptions" />
-	<option key="curloptions" />
-	<flag key="k" answer="off" />
-	<flag key="p" answer="off" />
+	<option key="folder" version_max="6.4"/>
+	<option key="wgetoptions" version_max="6.4"/>
+	<option key="curloptions" version_max="6.4"/>
+	<flag key="k" answer="off" version_max="6.4"/>
+	<flag key="o" answer="off"/>
+	<flag key="p" answer="off" version_max="6.4"/>
 	<option key="method" />
 	<option key="output" />
+	<option key="maxcols" advanced="yes" version_min="7.0"/>
+	<option key="maxrows" advanced="yes" version_min="7.0"/>
+	<option key="username" advanced="yes" version_min="7.0"/>
+	<option key="password" advanced="yes" version_min="7.0"/>
+	<option key="method" advanced="yes" version_min="7.0"/>
+	<option key="region" advanced="yes" version_min="7.0"/>
+	<option key="bgcolor" advanced="yes" version_min="7.0"/>
+	<option key="urlparams" advanced="yes" version_min="7.0"/>
 </qgisgrassmodule>
diff --git a/src/plugins/grass/modules/r.in.xyz.qgm b/src/plugins/grass/modules/r.in.xyz.qgm
index 6ae63eadc8aa..e04670a91fb0 100644
--- a/src/plugins/grass/modules/r.in.xyz.qgm
+++ b/src/plugins/grass/modules/r.in.xyz.qgm
@@ -5,7 +5,8 @@
 	<file key="input" type="old" filters="TXT (*.txt), CSV (*.csv)"/>
 	<option key="method" />
 	<option key="type" />
-	<option key="fs" />
+	<option key="fs" version_max="6.4" />
+	<option key="separator" version_min="7.0" />
 	<option key="x" />
 	<option key="y" />
 	<option key="z" />
diff --git a/src/plugins/grass/modules/r.out.ascii.qgm b/src/plugins/grass/modules/r.out.ascii.qgm
index ddca8ebeb91d..5721574f87c8 100644
--- a/src/plugins/grass/modules/r.out.ascii.qgm
+++ b/src/plugins/grass/modules/r.out.ascii.qgm
@@ -3,8 +3,10 @@
 
 <qgisgrassmodule label="Export raster to ASCII text file" module="r.out.ascii">
 	<option key="input" />
-	<option key="dp" answer="2"/>
-	<option key="null" />
+	<option key="dp" answer="2" version_max="6.4"/>
+	<option key="precision" answer="2" version_min="7.0"/>
+	<option key="null" version_max="6.4"/>
+	<option key="null_value" version_min="7.0"/>
 	<file key="output" type="new" />
 	<flag key="h" />
 	<flag key="s" />
diff --git a/src/plugins/grass/modules/r.out.mpeg.qgm b/src/plugins/grass/modules/r.out.mpeg.qgm
index f251c290ffa6..961bc50705f5 100644
--- a/src/plugins/grass/modules/r.out.mpeg.qgm
+++ b/src/plugins/grass/modules/r.out.mpeg.qgm
@@ -3,7 +3,8 @@
 
 <qgisgrassmodule label="Export raster series to MPEG movie" module="r.out.mpeg">
 	<file key="view1" label="Type in map names separated by a comma" />
-	<option key="qual" />
+	<option key="qual" version_max="6.4"/>
+	<option key="quality" version_min="7.0"/>
 	<flag key="c" />
 	<file key="output" type="new" filters="MPEG (*.mpg)" />
 </qgisgrassmodule>
diff --git a/src/plugins/grass/modules/r.out.pov.qgm b/src/plugins/grass/modules/r.out.pov.qgm
index 534e834b106d..63f7e9a71c58 100644
--- a/src/plugins/grass/modules/r.out.pov.qgm
+++ b/src/plugins/grass/modules/r.out.pov.qgm
@@ -2,9 +2,11 @@
 <!DOCTYPE qgisgrassmodule SYSTEM "http://mrcc.com/qgisgrassmodule.dtd">
 
 <qgisgrassmodule label="Export raster to POVRAY height-field file" module="r.out.pov">
-	<option key="map" />
+	<option key="map" version_max="6.4"/>
+	<option key="input" version_min="7.0"/>
 	<option key="hftype" />
 	<option key="bias" />
 	<option key="scale" />
-	<file key="tga" type="new" />
+	<file key="tga" type="new" version_max="6.4"/>
+	<file key="output" type="new" version_min="7.0"/>
 </qgisgrassmodule>
diff --git a/src/plugins/grass/modules/r.out.ppm.qgm b/src/plugins/grass/modules/r.out.ppm.qgm
index 6721373a9337..9ff44741e6b0 100644
--- a/src/plugins/grass/modules/r.out.ppm.qgm
+++ b/src/plugins/grass/modules/r.out.ppm.qgm
@@ -3,6 +3,7 @@
 
 <qgisgrassmodule label="Export raster to PPM image at the resolution of the current region" module="r.out.ppm">
 	<option key="input" />
-	<flag key="G" />
+	<flag key="G" version_max="6.4"/>
+	<flag key="g" version_min="7.0"/>
 	<file key="output" type="new" />
 </qgisgrassmodule>
diff --git a/src/plugins/grass/modules/r.out.vrml.qgm b/src/plugins/grass/modules/r.out.vrml.qgm
index bd9f950ed750..d7be3f43e301 100644
--- a/src/plugins/grass/modules/r.out.vrml.qgm
+++ b/src/plugins/grass/modules/r.out.vrml.qgm
@@ -2,8 +2,10 @@
 <!DOCTYPE qgisgrassmodule SYSTEM "http://mrcc.com/qgisgrassmodule.dtd">
 
 <qgisgrassmodule label="Export raster to Virtual Reality Modeling Language (VRML)" module="r.out.vrml">
-	<option key="elev" />
+	<option key="elev" version_max="6.4"/>
+	<option key="elevation" version_min="7.0"/>
 	<option key="color" />
-	<option key="exag" />
+	<option key="exag" version_max="6.4"/>
+	<option key="exaggeration" version_min="7.0"/>
 	<file key="output" type="new" />
 </qgisgrassmodule>
diff --git a/src/plugins/grass/modules/r.out.vtk.qgm b/src/plugins/grass/modules/r.out.vtk.qgm
index 4b1a9af9bd90..5ff35530add2 100644
--- a/src/plugins/grass/modules/r.out.vtk.qgm
+++ b/src/plugins/grass/modules/r.out.vtk.qgm
@@ -6,8 +6,11 @@
 	<option key="elevation" />
 	<flag key="p" answer="off" />
 	<option key="null" />
-	<option key="elevation2d" />
-	<option key="elevscale" />
-	<option key="dp" />
+	<option key="elevation2d" version_max="6.4"/>
+	<option key="elevscale" version_max="6.4"/>
+	<option key="dp" version_max="6.4"/>
+	<option key="z" version_min="7.0"/>
+	<option key="zscale" version_min="7.0"/>
+	<option key="precision" version_min="7.0"/>
 	<file key="output" type="new" filters="VTK (*.vtk)" />
 </qgisgrassmodule>
diff --git a/src/plugins/grass/modules/r.out.xyz.qgm b/src/plugins/grass/modules/r.out.xyz.qgm
index 9da08bfd56f4..622d4f6de59d 100644
--- a/src/plugins/grass/modules/r.out.xyz.qgm
+++ b/src/plugins/grass/modules/r.out.xyz.qgm
@@ -3,6 +3,7 @@
 
 <qgisgrassmodule label="Export raster to text file as x,y,z values based on cell centers" module="r.out.xyz">
 	<option key="input" />
-	<option key="fs" />
+	<option key="fs" version_max="6.4"/>
+	<option key="separator" version_min="7.0"/>
 	<file key="output" type="new" />
 </qgisgrassmodule>
diff --git a/src/plugins/grass/modules/r.stats.qgm b/src/plugins/grass/modules/r.stats.qgm
index 18e367da72d3..58a11a454e13 100644
--- a/src/plugins/grass/modules/r.stats.qgm
+++ b/src/plugins/grass/modules/r.stats.qgm
@@ -16,8 +16,10 @@
         <flag key="C" advanced="yes"/>
         <flag key="r" advanced="yes"/>
         <flag key="i" advanced="yes"/>
-        <option key="fs" advanced="yes"/>
-        <option key="nv" advanced="yes"/>
+        <option key="fs" advanced="yes" version_max="6.4"/>
+        <option key="separator" advanced="yes" version_min="7.0"/>
+        <option key="nv" advanced="yes" version_max="6.4"/>
+        <option key="null_value" advanced="yes" version_min="7.0"/>
         <option key="nsteps" advanced="yes"/>
 	<file key="output" type="new" advanced="yes"/>
 </qgisgrassmodule>
diff --git a/src/plugins/grass/modules/r.to.vect.area.qgm b/src/plugins/grass/modules/r.to.vect.area.qgm
index 117a6dc82ff5..6a56661a98b3 100644
--- a/src/plugins/grass/modules/r.to.vect.area.qgm
+++ b/src/plugins/grass/modules/r.to.vect.area.qgm
@@ -4,6 +4,7 @@
 <qgisgrassmodule label="Convert raster to vector areas" module="r.to.vect">
 	<option key="input" />
 	<option key="output" />
-	<option key="feature" answer="area" hidden="yes" />
+	<option key="feature" answer="area" hidden="yes" version_max="6.4"/>
+	<option key="type" answer="area" hidden="yes" version_min="7.0"/>
 	<flag key="s" answer="on" hidden="yes" />
 </qgisgrassmodule>
diff --git a/src/plugins/grass/modules/r.to.vect.line.qgm b/src/plugins/grass/modules/r.to.vect.line.qgm
index a03f577a8215..e4b1ada07153 100644
--- a/src/plugins/grass/modules/r.to.vect.line.qgm
+++ b/src/plugins/grass/modules/r.to.vect.line.qgm
@@ -4,6 +4,7 @@
 <qgisgrassmodule label="Convert raster to vector lines" module="r.to.vect">
 	<option key="input" />
 	<option key="output" />
-	<option key="feature" answer="line" hidden="yes" />
+	<option key="feature" answer="line" hidden="yes" version_max="6.4"/>
+	<option key="type" answer="line" hidden="yes" version_min="7.0"/>
 	<flag key="s" answer="on" hidden="yes" />
 </qgisgrassmodule>
diff --git a/src/plugins/grass/modules/r.to.vect.point.qgm b/src/plugins/grass/modules/r.to.vect.point.qgm
index 38b081527c1b..cbc7e7291be8 100644
--- a/src/plugins/grass/modules/r.to.vect.point.qgm
+++ b/src/plugins/grass/modules/r.to.vect.point.qgm
@@ -4,6 +4,7 @@
 <qgisgrassmodule label="Convert raster to vector points" module="r.to.vect">
 	<option key="input" />
 	<option key="output" />
-	<option key="feature" answer="point" hidden="yes" />
+	<option key="feature" answer="point" hidden="yes" version_max="6.4"/>
+	<option key="type" answer="point" hidden="yes" version_min="7.0"/>
 	<flag key="s" answer="on" hidden="yes" />
 </qgisgrassmodule>
diff --git a/src/plugins/grass/modules/v.in.ascii.qgm b/src/plugins/grass/modules/v.in.ascii.qgm
index 79729cb0cf08..2a493138df4a 100644
--- a/src/plugins/grass/modules/v.in.ascii.qgm
+++ b/src/plugins/grass/modules/v.in.ascii.qgm
@@ -5,7 +5,8 @@
 	<file key="input" label="Text file"/>
 	<option key="output"/>
 	<option key="format"/>
-        <option key="fs" label="Separator (| , \t etc.)" />
+        <option key="fs" label="Separator (| , \t etc.)" version_max="6.4" />
+        <option key="separator" label="Separator (| , \t etc.)" version_min="7.0" />
 	<option key="skip" label="Number of rows to be skipped"/>
 	<option key="x" label="Which column for the X coordinate? The first is 1"/>
         <option key="y" label="Which column for the Y coordinate?"/>
diff --git a/src/plugins/grass/modules/v.in.e00.qgm b/src/plugins/grass/modules/v.in.e00.qgm
index 27653837a81b..e057e8741cb8 100644
--- a/src/plugins/grass/modules/v.in.e00.qgm
+++ b/src/plugins/grass/modules/v.in.e00.qgm
@@ -2,7 +2,9 @@
 <!DOCTYPE qgisgrassmodule SYSTEM "http://mrcc.com/qgisgrassmodule.dtd">
 
 <qgisgrassmodule label="Import ESRI E00 vector" module="v.in.e00">
-	<file key="file" type="old" label="E00 vector layer" />
+	<file key="file" type="old" label="E00 vector layer" version_max="6.4"/>
+	<file key="input" type="old" label="E00 vector layer" version_min="7.0"/>
 	<option key="type" />
-	<option key="vect" />
+	<option key="vect" version_max="6.4"/>
+	<option key="output" version_min="7.0"/>
 </qgisgrassmodule>
diff --git a/src/plugins/grass/modules/v.in.ogr.all.loc.qgm b/src/plugins/grass/modules/v.in.ogr.all.loc.qgm
index cee8a54a7a19..ee55d9579a61 100644
--- a/src/plugins/grass/modules/v.in.ogr.all.loc.qgm
+++ b/src/plugins/grass/modules/v.in.ogr.all.loc.qgm
@@ -2,11 +2,17 @@
 <!DOCTYPE qgisgrassmodule SYSTEM "http://mrcc.com/qgisgrassmodule.dtd">
 
 <qgisgrassmodule label="Import all OGR/PostGIS vectors in a given data source and create a fitted location" module="v.in.ogr">
-	<option key="dsn" label="Path to the OGR data source" />
+	<option key="dsn" label="Path to the OGR data source" version_max="6.4"/>
+	<option key="input" label="Path to the OGR data source" version_min="7.0"/>
 	<option key="output" />
 	<option key="location" />
         <option key="type" advanced="yes"/>
-        <flag key="z" answer="off" hidden="no" advanced="yes"/>
+        <flag key="z" answer="off" hidden="no" advanced="yes" version_max="6.4"/>
+        <flag key="2" answer="off" hidden="no" advanced="yes" version_min="7.0"/>
+        <flag key="t" answer="off" hidden="no" advanced="yes"/>
+        <flag key="o" answer="off" hidden="no" advanced="yes"/>
+        <flag key="r" answer="off" hidden="no" advanced="yes"/>
+        <flag key="w" answer="off" hidden="no" advanced="yes"/>
         <flag key="e" answer="off" hidden="no" advanced="yes"/>
         <option key="snap" advanced="yes" /> 
         <option key="min_area" advanced="yes" />
diff --git a/src/plugins/grass/modules/v.in.ogr.all.qgm b/src/plugins/grass/modules/v.in.ogr.all.qgm
index 6375fe9ec943..c6edbb0bbdcc 100644
--- a/src/plugins/grass/modules/v.in.ogr.all.qgm
+++ b/src/plugins/grass/modules/v.in.ogr.all.qgm
@@ -2,10 +2,16 @@
 <!DOCTYPE qgisgrassmodule SYSTEM "http://mrcc.com/qgisgrassmodule.dtd">
 
 <qgisgrassmodule label="Import OGR vectors in a given data source combining them in a GRASS vector" module="v.in.ogr">
-	<file key="dsn" type="directory" label="Path to the OGR data source" />
+	<file key="dsn" type="directory" label="Path to the OGR data source" version_max="6.4"/>
+	<file key="input" type="directory" label="Path to the OGR data source" version_min="7.0"/>
 	<option key="output" />
         <option key="type" advanced="yes"/>
-        <flag key="z" answer="off" hidden="no" advanced="yes"/>
+        <flag key="z" answer="off" hidden="no" advanced="yes" version_max="6.4"/>
+        <flag key="2" answer="off" hidden="no" advanced="yes" version_min="7.0"/>
+        <flag key="t" answer="off" hidden="no" advanced="yes"/>
+        <flag key="o" answer="off" hidden="no" advanced="yes"/>
+        <flag key="r" answer="off" hidden="no" advanced="yes"/>
+        <flag key="w" answer="off" hidden="no" advanced="yes"/>
         <flag key="e" answer="off" hidden="no" advanced="yes"/>
         <option key="snap" advanced="yes" />
         <option key="min_area" advanced="yes" />
diff --git a/src/plugins/grass/modules/v.in.ogr.loc.qgm b/src/plugins/grass/modules/v.in.ogr.loc.qgm
index ede795c9ef9f..dc36ada683b4 100644
--- a/src/plugins/grass/modules/v.in.ogr.loc.qgm
+++ b/src/plugins/grass/modules/v.in.ogr.loc.qgm
@@ -2,11 +2,17 @@
 <!DOCTYPE qgisgrassmodule SYSTEM "http://mrcc.com/qgisgrassmodule.dtd">
 
 <qgisgrassmodule label="Import OGR vector and create a fitted location" module="v.in.ogr">
-	<file key="dsn" />
+	<file key="dsn" version_max="6.4"/>
+	<file key="input" version_min="7.0"/>
 	<option key="output" />
 	<option key="location" />
         <option key="type" advanced="yes"/>
-        <flag key="z" answer="off" hidden="no" advanced="yes"/>
+        <flag key="z" answer="off" hidden="no" advanced="yes" version_max="6.4"/>
+        <flag key="2" answer="off" hidden="no" advanced="yes" version_min="7.0"/>
+        <flag key="t" answer="off" hidden="no" advanced="yes"/>
+        <flag key="o" answer="off" hidden="no" advanced="yes"/>
+        <flag key="r" answer="off" hidden="no" advanced="yes"/>
+        <flag key="w" answer="off" hidden="no" advanced="yes"/>
         <flag key="e" answer="off" hidden="no" advanced="yes"/>
         <option key="snap" advanced="yes" /> 
         <option key="min_area" advanced="yes" />
diff --git a/src/plugins/grass/modules/v.in.ogr.qgis.loc.qgm b/src/plugins/grass/modules/v.in.ogr.qgis.loc.qgm
index d87c8ffdb5c6..b29b01b03faf 100644
--- a/src/plugins/grass/modules/v.in.ogr.qgis.loc.qgm
+++ b/src/plugins/grass/modules/v.in.ogr.qgis.loc.qgm
@@ -2,11 +2,17 @@
 <!DOCTYPE qgisgrassmodule SYSTEM "http://mrcc.com/qgisgrassmodule.dtd">
 
 <qgisgrassmodule label="Import loaded vector and create a fitted location" module="v.in.ogr"> 
-	<ogr key="dsn" layeroption="layer" whereoption="where" label="Loaded layer" /> 
+	<ogr key="dsn" layeroption="layer" whereoption="where" label="Loaded layer" version_max="6.4"/>
+	<ogr key="input" layeroption="layer" whereoption="where" label="Loaded layer" version_max="6.4"/>
 	<option key="output" />	
 	<option key="location" />
         <option key="type" advanced="yes"/>
-        <flag key="z" answer="off" hidden="no" advanced="yes"/>
+        <flag key="z" answer="off" hidden="no" advanced="yes" version_max="6.4"/>
+        <flag key="2" answer="off" hidden="no" advanced="yes" version_min="7.0"/>
+        <flag key="t" answer="off" hidden="no" advanced="yes"/>
+        <flag key="o" answer="off" hidden="no" advanced="yes"/>
+        <flag key="r" answer="off" hidden="no" advanced="yes"/>
+        <flag key="w" answer="off" hidden="no" advanced="yes"/>
         <flag key="e" answer="off" hidden="no" advanced="yes"/>
         <option key="snap" advanced="yes" /> 
         <option key="min_area" advanced="yes" />
diff --git a/src/plugins/grass/modules/v.in.ogr.qgis.qgm b/src/plugins/grass/modules/v.in.ogr.qgis.qgm
index 731b4036e09f..62873a157743 100644
--- a/src/plugins/grass/modules/v.in.ogr.qgis.qgm
+++ b/src/plugins/grass/modules/v.in.ogr.qgis.qgm
@@ -2,13 +2,19 @@
 <!DOCTYPE qgisgrassmodule SYSTEM "http://mrcc.com/qgisgrassmodule.dtd">
 
 <qgisgrassmodule label="Import loaded vector" module="v.in.ogr">
-        <ogr key="dsn" layeroption="layer" whereoption="where" label="Loaded layer" />
+        <ogr key="dsn" layeroption="layer" whereoption="where" label="Loaded layer" version_max="6.4"/>
+		<ogr key="input" layeroption="layer" whereoption="where" label="Loaded layer" version_min="7.0"/>
         <option key="output" />
-	<option key="type" advanced="yes"/>
-        <flag key="z" answer="off" hidden="no" advanced="yes" />
+        <option key="type" advanced="yes"/>
+        <flag key="z" answer="off" hidden="no" advanced="yes" version_max="6.4"/>
+        <flag key="2" answer="off" hidden="no" advanced="yes" version_min="7.0"/>
+        <flag key="t" answer="off" hidden="no" advanced="yes"/>
+        <flag key="o" answer="off" hidden="no" advanced="yes"/>
+        <flag key="r" answer="off" hidden="no" advanced="yes"/>
+        <flag key="w" answer="off" hidden="no" advanced="yes"/>
         <flag key="e" answer="off" hidden="no" advanced="yes" />
-	<option key="snap" advanced="yes" />
+	    <option key="snap" advanced="yes" />
         <option key="min_area" advanced="yes" />
         <option key="where" advanced="yes"/>
-	<flag key="o" answer="on" advanced="yes" />
+	    <flag key="o" answer="on" advanced="yes" />
 </qgisgrassmodule>
diff --git a/src/plugins/grass/modules/v.in.ogr.qgm b/src/plugins/grass/modules/v.in.ogr.qgm
index ca7ededfed3f..2ec21538bb0c 100644
--- a/src/plugins/grass/modules/v.in.ogr.qgm
+++ b/src/plugins/grass/modules/v.in.ogr.qgm
@@ -2,10 +2,16 @@
 <!DOCTYPE qgisgrassmodule SYSTEM "http://mrcc.com/qgisgrassmodule.dtd">
 
 <qgisgrassmodule label="Import OGR vector" module="v.in.ogr">
-	<file key="dsn" />
+	<file key="dsn" version_max="6.4"/>
+	<file key="input" version_min="7.0"/>
 	<option key="output" />	
         <option key="type" advanced="yes"/>
-        <flag key="z" answer="off" hidden="no" advanced="yes"/>
+        <flag key="z" answer="off" hidden="no" advanced="yes" version_max="6.4"/>
+        <flag key="2" answer="off" hidden="no" advanced="yes" version_min="7.0"/>
+        <flag key="t" answer="off" hidden="no" advanced="yes"/>
+        <flag key="o" answer="off" hidden="no" advanced="yes"/>
+        <flag key="r" answer="off" hidden="no" advanced="yes"/>
+        <flag key="w" answer="off" hidden="no" advanced="yes"/>
         <flag key="e" answer="off" hidden="no" advanced="yes"/>
         <option key="snap" advanced="yes" />
         <option key="min_area" advanced="yes" />
diff --git a/src/plugins/grass/modules/v.out.ascii.qgm b/src/plugins/grass/modules/v.out.ascii.qgm
index de4a327f5a3e..0786ce9dabb5 100644
--- a/src/plugins/grass/modules/v.out.ascii.qgm
+++ b/src/plugins/grass/modules/v.out.ascii.qgm
@@ -5,5 +5,6 @@
 	<option key="input" />
 	<option key="format"/>
 	<file key="output" type="new" />
-	<option key="fs" advanced="yes" />
+	<option key="fs" advanced="yes" version_max="6.4"/>
+	<option key="separator" advanced="yes" version_min="7.0"/>
 </qgisgrassmodule>
diff --git a/src/plugins/grass/modules/v.out.ogr.gml.qgm b/src/plugins/grass/modules/v.out.ogr.gml.qgm
index 2c5192a23a82..23d842655c35 100644
--- a/src/plugins/grass/modules/v.out.ogr.gml.qgm
+++ b/src/plugins/grass/modules/v.out.ogr.gml.qgm
@@ -4,6 +4,8 @@
 <qgisgrassmodule label="Export vector to GML" module="v.out.ogr">
 	<option key="input" layeroption="layer" typeoption="type" />
 	<option key="format" answer="GML" hidden="yes" />
-	<file key="dsn" type="new" label="Output GML file" filters="GML (*.gml)" />
-	<option key="olayer" answer="default" label="Output layer name (used in GML file)" />
+	<file key="dsn" type="new" label="Output GML file" filters="GML (*.gml)" version_max="6.4"/>
+	<file key="output" type="new" label="Output GML file" filters="GML (*.gml)" version_min="7.0"/>
+	<option key="olayer" answer="default" label="Output layer name (used in GML file)" version_max="6.4"/>
+	<option key="output_layer" answer="default" label="Output layer name (used in GML file)" version_min="7.0"/>
 </qgisgrassmodule>
diff --git a/src/plugins/grass/modules/v.out.ogr.mapinfo.qgm b/src/plugins/grass/modules/v.out.ogr.mapinfo.qgm
index 6acfcb52886e..fbf603311d07 100644
--- a/src/plugins/grass/modules/v.out.ogr.mapinfo.qgm
+++ b/src/plugins/grass/modules/v.out.ogr.mapinfo.qgm
@@ -4,5 +4,6 @@
 <qgisgrassmodule label="Export vector to Mapinfo" module="v.out.ogr">
 	<option key="input" layeroption="layer" typeoption="type" />
 	<option key="format" answer="MapInfo_File" hidden="yes" />
-	<file key="dsn" type="new" fileoption="olayer" label="Output Shapefile" filters="MapInfo (*.tab)" />
+	<file key="dsn" type="new" fileoption="olayer" label="Output Shapefile" filters="MapInfo (*.tab)" version_max="6.4"/>
+	<file key="output" type="new" fileoption="olayer" label="Output Shapefile" filters="MapInfo (*.tab)" version_min="7.0"/>
 </qgisgrassmodule>
\ No newline at end of file
diff --git a/src/plugins/grass/modules/v.out.ogr.qgm b/src/plugins/grass/modules/v.out.ogr.qgm
index 65f5965029c8..9e2c925e4624 100644
--- a/src/plugins/grass/modules/v.out.ogr.qgm
+++ b/src/plugins/grass/modules/v.out.ogr.qgm
@@ -4,8 +4,10 @@
 <qgisgrassmodule label="Export vector to various formats (OGR library)" module="v.out.ogr">
 	<option key="input" layeroption="layer" typeoption="type" />
 	<option key="format"/>
-	<file key="dsn" type="new" label="Name for new vector file (specify file extension)" />
-	<option key="olayer" answer="default" hidden="yes" />
+	<file key="dsn" type="new" label="Name for new vector file (specify file extension)" version_max="6.4"/>
+	<file key="output" type="new" label="Name for new vector file (specify file extension)" version_min="7.0"/>
+	<option key="olayer" answer="default" hidden="yes" version_max="6.4"/>
+	<option key="output_layer" answer="default" hidden="yes" version_min="7.0"/>
 	<flag key="e" answer="on" hidden="yes" />
 	<flag key="c" answer="on" hidden="no" label="Write only features link to a record"/>
 </qgisgrassmodule>
diff --git a/src/plugins/grass/modules/v.out.vtk.qgm b/src/plugins/grass/modules/v.out.vtk.qgm
index 2e24ac6523ef..b6c1dfd1fcb6 100644
--- a/src/plugins/grass/modules/v.out.vtk.qgm
+++ b/src/plugins/grass/modules/v.out.vtk.qgm
@@ -3,6 +3,7 @@
 
 <qgisgrassmodule label="Export vector to VTK-ASCII" module="v.out.vtk">
 	<option key="input" layeroption="layer" typeoption="type" />
-	<option key="scale" />
+	<option key="scale" version_max="6.4"/>
+	<option key="zscale" version_min="7.0"/>
 	<file key="output" filters="VTK (*.vtk)"/>
 </qgisgrassmodule>
diff --git a/src/plugins/grass/modules/v.to.rast.attr.qgm b/src/plugins/grass/modules/v.to.rast.attr.qgm
index d6ab136af1c7..feec81ba2929 100644
--- a/src/plugins/grass/modules/v.to.rast.attr.qgm
+++ b/src/plugins/grass/modules/v.to.rast.attr.qgm
@@ -3,7 +3,8 @@
 
 <qgisgrassmodule label="Convert vector to raster using attribute values" module="v.to.rast">
 	<option key="input" layeroption="layer"/>
-	<field key="column" layer="input" type="integer,double" label="Attribute field" />
+	<field key="column" layer="input" type="integer,double" label="Attribute field" version_max="6.4"/>
+	<field key="attribute_column" layer="input" type="integer,double" label="Attribute field" version_min="7.0"/>
 	<option key="output"/>
 	<option key="use" answer="attr" hidden="yes" />
 </qgisgrassmodule>