diff --git a/definitions/grib2/cfVarName.def b/definitions/grib2/cfVarName.def
index f0ed2ae7b..665961abb 100644
--- a/definitions/grib2/cfVarName.def
+++ b/definitions/grib2/cfVarName.def
@@ -33,6 +33,54 @@
 	 scaleFactorOfFirstFixedSurface = 0 ;
 	 scaledValueOfFirstFixedSurface = 10 ;
 	}
+#Soil moisture top 100 cm
+'sm100' = {
+	 discipline = 2 ;
+	 parameterCategory = 0 ;
+	 parameterNumber = 22 ;
+	 scaledValueOfSecondFixedSurface = 10 ;
+	 scaleFactorOfSecondFixedSurface = 1 ;
+	 typeOfFirstFixedSurface = 106 ;
+	 scaleFactorOfFirstFixedSurface = 0 ;
+	 scaledValueOfFirstFixedSurface = 0 ;
+	 typeOfSecondFixedSurface = 106 ;
+	}
+#Soil moisture top 20 cm
+'sm20' = {
+	 discipline = 2 ;
+	 parameterCategory = 0 ;
+	 parameterNumber = 22 ;
+	 scaleFactorOfFirstFixedSurface = 0 ;
+	 scaledValueOfFirstFixedSurface = 0 ;
+	 typeOfSecondFixedSurface = 106 ;
+	 scaledValueOfSecondFixedSurface = 2 ;
+	 scaleFactorOfSecondFixedSurface = 1 ;
+	 typeOfFirstFixedSurface = 106 ;
+	}
+#Soil temperature top 20 cm
+'st20' = {
+	 discipline = 2 ;
+	 parameterCategory = 0 ;
+	 parameterNumber = 2 ;
+	 scaledValueOfFirstFixedSurface = 0 ;
+	 typeOfSecondFixedSurface = 106 ;
+	 scaledValueOfSecondFixedSurface = 2 ;
+	 scaleFactorOfSecondFixedSurface = 1 ;
+	 typeOfFirstFixedSurface = 106 ;
+	 scaleFactorOfFirstFixedSurface = 0 ;
+	}
+#Soil temperature top 100 cm
+'st100' = {
+	 discipline = 2 ;
+	 parameterCategory = 0 ;
+	 parameterNumber = 2 ;
+	 scaleFactorOfSecondFixedSurface = 1 ;
+	 typeOfFirstFixedSurface = 106 ;
+	 scaleFactorOfFirstFixedSurface = 0 ;
+	 scaledValueOfFirstFixedSurface = 0 ;
+	 typeOfSecondFixedSurface = 106 ;
+	 scaledValueOfSecondFixedSurface = 10 ;
+	}
 #Cloudy brightness temperature
 'p260510' = {
          discipline = 3 ;
@@ -171,6 +219,12 @@
 	 parameterCategory = 0 ;
 	 parameterNumber = 3 ;
 	}
+#Surface runoff
+'sro' = {
+	 discipline = 2 ;
+	 parameterCategory = 0 ;
+	 parameterNumber = 34 ;
+	}
 #Total precipitation of at least 10 mm
 'tpg10' = {
 	 discipline = 0 ;
diff --git a/definitions/grib2/localConcepts/ecmf/cfVarName.def b/definitions/grib2/localConcepts/ecmf/cfVarName.def
index e50155010..d793341f8 100644
--- a/definitions/grib2/localConcepts/ecmf/cfVarName.def
+++ b/definitions/grib2/localConcepts/ecmf/cfVarName.def
@@ -13899,12 +13899,6 @@
 	 parameterCategory = 174 ;
 	 parameterNumber = 6 ;
 	}
-#Surface runoff
-'sro' = {
-	 discipline = 192 ;
-	 parameterCategory = 174 ;
-	 parameterNumber = 8 ;
-	}
 #Sub-surface runoff
 'ssro' = {
 	 discipline = 192 ;
diff --git a/definitions/grib2/localConcepts/ecmf/name.def b/definitions/grib2/localConcepts/ecmf/name.def
index 5e0d348f9..8090733e0 100644
--- a/definitions/grib2/localConcepts/ecmf/name.def
+++ b/definitions/grib2/localConcepts/ecmf/name.def
@@ -13899,12 +13899,6 @@
 	 parameterCategory = 174 ;
 	 parameterNumber = 6 ;
 	}
-#Surface runoff
-'Surface runoff' = {
-	 discipline = 192 ;
-	 parameterCategory = 174 ;
-	 parameterNumber = 8 ;
-	}
 #Sub-surface runoff
 'Sub-surface runoff' = {
 	 discipline = 192 ;
diff --git a/definitions/grib2/localConcepts/ecmf/paramId.def b/definitions/grib2/localConcepts/ecmf/paramId.def
index 7f1f3cd45..80bdb25ce 100644
--- a/definitions/grib2/localConcepts/ecmf/paramId.def
+++ b/definitions/grib2/localConcepts/ecmf/paramId.def
@@ -13899,12 +13899,6 @@
 	 parameterCategory = 174 ;
 	 parameterNumber = 6 ;
 	}
-#Surface runoff
-'174008' = {
-	 discipline = 192 ;
-	 parameterCategory = 174 ;
-	 parameterNumber = 8 ;
-	}
 #Sub-surface runoff
 '174009' = {
 	 discipline = 192 ;
diff --git a/definitions/grib2/localConcepts/ecmf/shortName.def b/definitions/grib2/localConcepts/ecmf/shortName.def
index ded69ef60..45deb24e1 100644
--- a/definitions/grib2/localConcepts/ecmf/shortName.def
+++ b/definitions/grib2/localConcepts/ecmf/shortName.def
@@ -13899,12 +13899,6 @@
 	 parameterCategory = 174 ;
 	 parameterNumber = 6 ;
 	}
-#Surface runoff
-'sro' = {
-	 discipline = 192 ;
-	 parameterCategory = 174 ;
-	 parameterNumber = 8 ;
-	}
 #Sub-surface runoff
 'ssro' = {
 	 discipline = 192 ;
diff --git a/definitions/grib2/localConcepts/ecmf/units.def b/definitions/grib2/localConcepts/ecmf/units.def
index 84a1a3aa3..2ad761d9e 100644
--- a/definitions/grib2/localConcepts/ecmf/units.def
+++ b/definitions/grib2/localConcepts/ecmf/units.def
@@ -13899,12 +13899,6 @@
 	 parameterCategory = 174 ;
 	 parameterNumber = 6 ;
 	}
-#Surface runoff
-'kg m**-2' = {
-	 discipline = 192 ;
-	 parameterCategory = 174 ;
-	 parameterNumber = 8 ;
-	}
 #Sub-surface runoff
 'kg m**-2' = {
 	 discipline = 192 ;
diff --git a/definitions/grib2/name.def b/definitions/grib2/name.def
index c75ffe633..f9a136960 100644
--- a/definitions/grib2/name.def
+++ b/definitions/grib2/name.def
@@ -33,6 +33,54 @@
 	 scaleFactorOfFirstFixedSurface = 0 ;
 	 typeOfStatisticalProcessing = 2 ;
 	}
+#Soil moisture top 100 cm
+'Soil moisture top 100 cm' = {
+	 discipline = 2 ;
+	 parameterCategory = 0 ;
+	 parameterNumber = 22 ;
+	 scaleFactorOfSecondFixedSurface = 1 ;
+	 typeOfSecondFixedSurface = 106 ;
+	 typeOfFirstFixedSurface = 106 ;
+	 scaledValueOfSecondFixedSurface = 10 ;
+	 scaledValueOfFirstFixedSurface = 0 ;
+	 scaleFactorOfFirstFixedSurface = 0 ;
+	}
+#Soil moisture top 20 cm
+'Soil moisture top 20 cm' = {
+	 discipline = 2 ;
+	 parameterCategory = 0 ;
+	 parameterNumber = 22 ;
+	 scaleFactorOfSecondFixedSurface = 1 ;
+	 typeOfSecondFixedSurface = 106 ;
+	 typeOfFirstFixedSurface = 106 ;
+	 scaledValueOfSecondFixedSurface = 2 ;
+	 scaledValueOfFirstFixedSurface = 0 ;
+	 scaleFactorOfFirstFixedSurface = 0 ;
+	}
+#Soil temperature top 20 cm
+'Soil temperature top 20 cm' = {
+	 discipline = 2 ;
+	 parameterCategory = 0 ;
+	 parameterNumber = 2 ;
+	 scaledValueOfFirstFixedSurface = 0 ;
+	 scaleFactorOfFirstFixedSurface = 0 ;
+	 scaleFactorOfSecondFixedSurface = 1 ;
+	 typeOfSecondFixedSurface = 106 ;
+	 typeOfFirstFixedSurface = 106 ;
+	 scaledValueOfSecondFixedSurface = 2 ;
+	}
+#Soil temperature top 100 cm
+'Soil temperature top 100 cm' = {
+	 discipline = 2 ;
+	 parameterCategory = 0 ;
+	 parameterNumber = 2 ;
+	 scaledValueOfSecondFixedSurface = 10 ;
+	 scaledValueOfFirstFixedSurface = 0 ;
+	 scaleFactorOfFirstFixedSurface = 0 ;
+	 scaleFactorOfSecondFixedSurface = 1 ;
+	 typeOfSecondFixedSurface = 106 ;
+	 typeOfFirstFixedSurface = 106 ;
+	}
 #Cloudy brightness temperature
 'Cloudy brightness temperature' = {
          discipline = 3 ;
@@ -171,6 +219,12 @@
 	 parameterCategory = 0 ;
 	 parameterNumber = 3 ;
 	}
+#Surface runoff
+'Surface runoff' = {
+	 discipline = 2 ;
+	 parameterCategory = 0 ;
+	 parameterNumber = 34 ;
+	}
 #Total precipitation of at least 10 mm
 'Total precipitation of at least 10 mm' = {
 	 discipline = 0 ;
diff --git a/definitions/grib2/paramId.def b/definitions/grib2/paramId.def
index 2b6938f59..cc1b7a49f 100644
--- a/definitions/grib2/paramId.def
+++ b/definitions/grib2/paramId.def
@@ -33,6 +33,54 @@
 	 scaleFactorOfFirstFixedSurface = 0 ;
 	 scaledValueOfFirstFixedSurface = 10 ;
 	}
+#Soil moisture top 100 cm
+'228037' = {
+	 discipline = 2 ;
+	 parameterCategory = 0 ;
+	 parameterNumber = 22 ;
+	 typeOfSecondFixedSurface = 106 ;
+	 typeOfFirstFixedSurface = 106 ;
+	 scaleFactorOfFirstFixedSurface = 0 ;
+	 scaledValueOfFirstFixedSurface = 0 ;
+	 scaledValueOfSecondFixedSurface = 10 ;
+	 scaleFactorOfSecondFixedSurface = 1 ;
+	}
+#Soil moisture top 20 cm
+'228038' = {
+	 discipline = 2 ;
+	 parameterCategory = 0 ;
+	 parameterNumber = 22 ;
+	 typeOfSecondFixedSurface = 106 ;
+	 typeOfFirstFixedSurface = 106 ;
+	 scaleFactorOfFirstFixedSurface = 0 ;
+	 scaledValueOfFirstFixedSurface = 0 ;
+	 scaledValueOfSecondFixedSurface = 2 ;
+	 scaleFactorOfSecondFixedSurface = 1 ;
+	}
+#Soil temperature top 20 cm
+'228137' = {
+	 discipline = 2 ;
+	 parameterCategory = 0 ;
+	 parameterNumber = 2 ;
+	 typeOfSecondFixedSurface = 106 ;
+	 typeOfFirstFixedSurface = 106 ;
+	 scaleFactorOfFirstFixedSurface = 0 ;
+	 scaledValueOfFirstFixedSurface = 0 ;
+	 scaledValueOfSecondFixedSurface = 2 ;
+	 scaleFactorOfSecondFixedSurface = 1 ;
+	}
+#Soil temperature top 100 cm
+'228138' = {
+	 discipline = 2 ;
+	 parameterCategory = 0 ;
+	 parameterNumber = 2 ;
+	 typeOfSecondFixedSurface = 106 ;
+	 typeOfFirstFixedSurface = 106 ;
+	 scaleFactorOfFirstFixedSurface = 0 ;
+	 scaledValueOfFirstFixedSurface = 0 ;
+	 scaledValueOfSecondFixedSurface = 10 ;
+	 scaleFactorOfSecondFixedSurface = 1 ;
+	}
 #Cloudy brightness temperature
 '260510' = {
          discipline = 3 ;
@@ -171,6 +219,12 @@
 	 parameterCategory = 0 ;
 	 parameterNumber = 3 ;
 	}
+#Surface runoff
+'174008' = {
+	 discipline = 2 ;
+	 parameterCategory = 0 ;
+	 parameterNumber = 34 ;
+	}
 #Total precipitation of at least 10 mm
 '131062' = {
 	 discipline = 0 ;
diff --git a/definitions/grib2/shortName.def b/definitions/grib2/shortName.def
index 78bb0248f..448d5ac82 100644
--- a/definitions/grib2/shortName.def
+++ b/definitions/grib2/shortName.def
@@ -33,6 +33,54 @@
 	 scaledValueOfFirstFixedSurface = 10 ;
 	 typeOfStatisticalProcessing = 2 ;
 	}
+#Soil moisture top 100 cm
+'sm100' = {
+	 discipline = 2 ;
+	 parameterCategory = 0 ;
+	 parameterNumber = 22 ;
+	 typeOfSecondFixedSurface = 106 ;
+	 typeOfFirstFixedSurface = 106 ;
+	 scaledValueOfSecondFixedSurface = 10 ;
+	 scaleFactorOfSecondFixedSurface = 1 ;
+	 scaleFactorOfFirstFixedSurface = 0 ;
+	 scaledValueOfFirstFixedSurface = 0 ;
+	}
+#Soil moisture top 20 cm
+'sm20' = {
+	 discipline = 2 ;
+	 parameterCategory = 0 ;
+	 parameterNumber = 22 ;
+	 typeOfSecondFixedSurface = 106 ;
+	 typeOfFirstFixedSurface = 106 ;
+	 scaleFactorOfFirstFixedSurface = 0 ;
+	 scaledValueOfFirstFixedSurface = 0 ;
+	 scaledValueOfSecondFixedSurface = 2 ;
+	 scaleFactorOfSecondFixedSurface = 1 ;
+	}
+#Soil temperature top 20 cm
+'st20' = {
+	 discipline = 2 ;
+	 parameterCategory = 0 ;
+	 parameterNumber = 2 ;
+	 typeOfSecondFixedSurface = 106 ;
+	 typeOfFirstFixedSurface = 106 ;
+	 scaledValueOfFirstFixedSurface = 0 ;
+	 scaledValueOfSecondFixedSurface = 2 ;
+	 scaleFactorOfSecondFixedSurface = 1 ;
+	 scaleFactorOfFirstFixedSurface = 0 ;
+	}
+#Soil temperature top 100 cm
+'st100' = {
+	 discipline = 2 ;
+	 parameterCategory = 0 ;
+	 parameterNumber = 2 ;
+	 typeOfSecondFixedSurface = 106 ;
+	 typeOfFirstFixedSurface = 106 ;
+	 scaleFactorOfSecondFixedSurface = 1 ;
+	 scaleFactorOfFirstFixedSurface = 0 ;
+	 scaledValueOfFirstFixedSurface = 0 ;
+	 scaledValueOfSecondFixedSurface = 10 ;
+	}
 #Cloudy brightness temperature
 'clbt' = {
 	 discipline = 3 ;
@@ -171,6 +219,12 @@
 	 parameterCategory = 0 ;
 	 parameterNumber = 3 ;
 	}
+#Surface runoff
+'sro' = {
+	 discipline = 2 ;
+	 parameterCategory = 0 ;
+	 parameterNumber = 34 ;
+	}
 #Total precipitation of at least 10 mm
 'tpg10' = {
 	 discipline = 0 ;
diff --git a/definitions/grib2/units.def b/definitions/grib2/units.def
index 69fba277a..bdd2f5a1b 100644
--- a/definitions/grib2/units.def
+++ b/definitions/grib2/units.def
@@ -33,6 +33,54 @@
 	 scaleFactorOfFirstFixedSurface = 0 ;
 	 typeOfStatisticalProcessing = 2 ;
 	}
+#Soil moisture top 100 cm
+'kg m**-3' = {
+	 discipline = 2 ;
+	 parameterCategory = 0 ;
+	 parameterNumber = 22 ;
+	 scaleFactorOfSecondFixedSurface = 1 ;
+	 typeOfSecondFixedSurface = 106 ;
+	 typeOfFirstFixedSurface = 106 ;
+	 scaledValueOfSecondFixedSurface = 10 ;
+	 scaledValueOfFirstFixedSurface = 0 ;
+	 scaleFactorOfFirstFixedSurface = 0 ;
+	}
+#Soil moisture top 20 cm
+'kg m**-3' = {
+	 discipline = 2 ;
+	 parameterCategory = 0 ;
+	 parameterNumber = 22 ;
+	 scaleFactorOfSecondFixedSurface = 1 ;
+	 typeOfSecondFixedSurface = 106 ;
+	 typeOfFirstFixedSurface = 106 ;
+	 scaledValueOfSecondFixedSurface = 2 ;
+	 scaledValueOfFirstFixedSurface = 0 ;
+	 scaleFactorOfFirstFixedSurface = 0 ;
+	}
+#Soil temperature top 20 cm
+'K' = {
+	 discipline = 2 ;
+	 parameterCategory = 0 ;
+	 parameterNumber = 2 ;
+	 scaledValueOfFirstFixedSurface = 0 ;
+	 scaleFactorOfFirstFixedSurface = 0 ;
+	 scaleFactorOfSecondFixedSurface = 1 ;
+	 typeOfSecondFixedSurface = 106 ;
+	 typeOfFirstFixedSurface = 106 ;
+	 scaledValueOfSecondFixedSurface = 2 ;
+	}
+#Soil temperature top 100 cm
+'K' = {
+	 discipline = 2 ;
+	 parameterCategory = 0 ;
+	 parameterNumber = 2 ;
+	 scaledValueOfSecondFixedSurface = 10 ;
+	 scaledValueOfFirstFixedSurface = 0 ;
+	 scaleFactorOfFirstFixedSurface = 0 ;
+	 scaleFactorOfSecondFixedSurface = 1 ;
+	 typeOfSecondFixedSurface = 106 ;
+	 typeOfFirstFixedSurface = 106 ;
+	}
 #Cloudy brightness temperature
 'K' = {
 	 discipline = 3 ;
@@ -171,6 +219,12 @@
 	 parameterCategory = 0 ;
 	 parameterNumber = 3 ;
 	}
+#Surface runoff
+'kg m**-2' = {
+	 discipline = 2 ;
+	 parameterCategory = 0 ;
+	 parameterNumber = 34 ;
+	}
 #Total precipitation of at least 10 mm
 '%' = {
 	 discipline = 0 ;
diff --git a/tests/tigge_conversions.sh b/tests/tigge_conversions.sh
index 080645fb7..54d4c460e 100755
--- a/tests/tigge_conversions.sh
+++ b/tests/tigge_conversions.sh
@@ -21,7 +21,7 @@ temp1="temp.grib1_"
 temp2="temp.grib2_"
 
 # --- Do I want to exclude any file pattern from the comparison ?
-exclusion_pattern="tcw|ssr|str|skt|cap|ci|ttr"
+exclusion_pattern="tcw|ssr|str|skt|cap|ci|ttr|st|sm"
 
 for file in `ls ${dir}/tigge_*.grib`
 do