diff --git a/definitions/grib2/cfVarName.def b/definitions/grib2/cfVarName.def
index 25f42d11f..f93b317fe 100644
--- a/definitions/grib2/cfVarName.def
+++ b/definitions/grib2/cfVarName.def
@@ -21,6 +21,66 @@
          parameterCategory = 1 ;
          parameterNumber = 15 ;
         }
+#Scaled radiance
+'p260530' = {
+	 discipline = 3 ;
+	 parameterCategory = 0 ;
+	 parameterNumber = 0 ;
+	}
+#Scaled albedo
+'p260531' = {
+	 discipline = 3 ;
+	 parameterCategory = 0 ;
+	 parameterNumber = 1 ;
+	}
+#Scaled brightness temperature
+'p260532' = {
+	 discipline = 3 ;
+	 parameterCategory = 0 ;
+	 parameterNumber = 2 ;
+	}
+#Scaled precipitable water
+'p260533' = {
+	 discipline = 3 ;
+	 parameterCategory = 0 ;
+	 parameterNumber = 3 ;
+	}
+#Scaled lifted index
+'p260534' = {
+	 discipline = 3 ;
+	 parameterCategory = 0 ;
+	 parameterNumber = 4 ;
+	}
+#Scaled cloud top pressure
+'p260535' = {
+	 discipline = 3 ;
+	 parameterCategory = 0 ;
+	 parameterNumber = 5 ;
+	}
+#Scaled skin temperature
+'p260536' = {
+	 discipline = 3 ;
+	 parameterCategory = 0 ;
+	 parameterNumber = 6 ;
+	}
+#Cloud mask
+'p260537' = {
+	 discipline = 3 ;
+	 parameterCategory = 0 ;
+	 parameterNumber = 7 ;
+	}
+#Pixel scene type
+'p260538' = {
+	 discipline = 3 ;
+	 parameterCategory = 0 ;
+	 parameterNumber = 8 ;
+	}
+#Fire detection indicator
+'p260539' = {
+	 discipline = 3 ;
+	 parameterCategory = 0 ;
+	 parameterNumber = 9 ;
+	}
 #Virtual temperature
 'p300012' = {
 	 discipline = 0 ;
diff --git a/definitions/grib2/name.def b/definitions/grib2/name.def
index 9ef5379f0..2e4647d5e 100644
--- a/definitions/grib2/name.def
+++ b/definitions/grib2/name.def
@@ -21,6 +21,66 @@
          parameterCategory = 1 ;
          parameterNumber = 15 ;
         }
+#Scaled radiance
+'Scaled radiance' = {
+	 discipline = 3 ;
+	 parameterCategory = 0 ;
+	 parameterNumber = 0 ;
+	}
+#Scaled albedo
+'Scaled albedo' = {
+	 discipline = 3 ;
+	 parameterCategory = 0 ;
+	 parameterNumber = 1 ;
+	}
+#Scaled brightness temperature
+'Scaled brightness temperature' = {
+	 discipline = 3 ;
+	 parameterCategory = 0 ;
+	 parameterNumber = 2 ;
+	}
+#Scaled precipitable water
+'Scaled precipitable water' = {
+	 discipline = 3 ;
+	 parameterCategory = 0 ;
+	 parameterNumber = 3 ;
+	}
+#Scaled lifted index
+'Scaled lifted index' = {
+	 discipline = 3 ;
+	 parameterCategory = 0 ;
+	 parameterNumber = 4 ;
+	}
+#Scaled cloud top pressure
+'Scaled cloud top pressure' = {
+	 discipline = 3 ;
+	 parameterCategory = 0 ;
+	 parameterNumber = 5 ;
+	}
+#Scaled skin temperature
+'Scaled skin temperature' = {
+	 discipline = 3 ;
+	 parameterCategory = 0 ;
+	 parameterNumber = 6 ;
+	}
+#Cloud mask
+'Cloud mask' = {
+	 discipline = 3 ;
+	 parameterCategory = 0 ;
+	 parameterNumber = 7 ;
+	}
+#Pixel scene type
+'Pixel scene type' = {
+	 discipline = 3 ;
+	 parameterCategory = 0 ;
+	 parameterNumber = 8 ;
+	}
+#Fire detection indicator
+'Fire detection indicator' = {
+	 discipline = 3 ;
+	 parameterCategory = 0 ;
+	 parameterNumber = 9 ;
+	}
 #Virtual temperature
 'Virtual temperature' = {
 	 discipline = 0 ;
diff --git a/definitions/grib2/paramId.def b/definitions/grib2/paramId.def
index 972e1fa6d..080405e4d 100644
--- a/definitions/grib2/paramId.def
+++ b/definitions/grib2/paramId.def
@@ -21,6 +21,66 @@
          parameterCategory = 1 ;
          parameterNumber = 15 ;
         }
+#Scaled radiance
+'260530' = {
+	 discipline = 3 ;
+	 parameterCategory = 0 ;
+	 parameterNumber = 0 ;
+	}
+#Scaled albedo
+'260531' = {
+	 discipline = 3 ;
+	 parameterCategory = 0 ;
+	 parameterNumber = 1 ;
+	}
+#Scaled brightness temperature
+'260532' = {
+	 discipline = 3 ;
+	 parameterCategory = 0 ;
+	 parameterNumber = 2 ;
+	}
+#Scaled precipitable water
+'260533' = {
+	 discipline = 3 ;
+	 parameterCategory = 0 ;
+	 parameterNumber = 3 ;
+	}
+#Scaled lifted index
+'260534' = {
+	 discipline = 3 ;
+	 parameterCategory = 0 ;
+	 parameterNumber = 4 ;
+	}
+#Scaled cloud top pressure
+'260535' = {
+	 discipline = 3 ;
+	 parameterCategory = 0 ;
+	 parameterNumber = 5 ;
+	}
+#Scaled skin temperature
+'260536' = {
+	 discipline = 3 ;
+	 parameterCategory = 0 ;
+	 parameterNumber = 6 ;
+	}
+#Cloud mask
+'260537' = {
+	 discipline = 3 ;
+	 parameterCategory = 0 ;
+	 parameterNumber = 7 ;
+	}
+#Pixel scene type
+'260538' = {
+	 discipline = 3 ;
+	 parameterCategory = 0 ;
+	 parameterNumber = 8 ;
+	}
+#Fire detection indicator
+'260539' = {
+	 discipline = 3 ;
+	 parameterCategory = 0 ;
+	 parameterNumber = 9 ;
+	}
 #Virtual temperature
 '300012' = {
 	 discipline = 0 ;
diff --git a/definitions/grib2/shortName.def b/definitions/grib2/shortName.def
index 07e371246..9a83f3afb 100644
--- a/definitions/grib2/shortName.def
+++ b/definitions/grib2/shortName.def
@@ -21,6 +21,66 @@
 	 parameterCategory = 1 ;
 	 parameterNumber = 15 ;
 	}
+#Scaled radiance
+'~' = {
+	 discipline = 3 ;
+	 parameterCategory = 0 ;
+	 parameterNumber = 0 ;
+	}
+#Scaled albedo
+'~' = {
+	 discipline = 3 ;
+	 parameterCategory = 0 ;
+	 parameterNumber = 1 ;
+	}
+#Scaled brightness temperature
+'~' = {
+	 discipline = 3 ;
+	 parameterCategory = 0 ;
+	 parameterNumber = 2 ;
+	}
+#Scaled precipitable water
+'~' = {
+	 discipline = 3 ;
+	 parameterCategory = 0 ;
+	 parameterNumber = 3 ;
+	}
+#Scaled lifted index
+'~' = {
+	 discipline = 3 ;
+	 parameterCategory = 0 ;
+	 parameterNumber = 4 ;
+	}
+#Scaled cloud top pressure
+'~' = {
+	 discipline = 3 ;
+	 parameterCategory = 0 ;
+	 parameterNumber = 5 ;
+	}
+#Scaled skin temperature
+'~' = {
+	 discipline = 3 ;
+	 parameterCategory = 0 ;
+	 parameterNumber = 6 ;
+	}
+#Cloud mask
+'~' = {
+	 discipline = 3 ;
+	 parameterCategory = 0 ;
+	 parameterNumber = 7 ;
+	}
+#Pixel scene type
+'~' = {
+	 discipline = 3 ;
+	 parameterCategory = 0 ;
+	 parameterNumber = 8 ;
+	}
+#Fire detection indicator
+'~' = {
+	 discipline = 3 ;
+	 parameterCategory = 0 ;
+	 parameterNumber = 9 ;
+	}
 #Virtual temperature
 'vtmp' = {
 	 discipline = 0 ;
diff --git a/definitions/grib2/units.def b/definitions/grib2/units.def
index 2eef00805..4cac97bac 100644
--- a/definitions/grib2/units.def
+++ b/definitions/grib2/units.def
@@ -21,6 +21,66 @@
 	 parameterCategory = 1 ;
 	 parameterNumber = 15 ;
 	}
+#Scaled radiance
+'Numeric' = {
+	 discipline = 3 ;
+	 parameterCategory = 0 ;
+	 parameterNumber = 0 ;
+	}
+#Scaled albedo
+'Numeric' = {
+	 discipline = 3 ;
+	 parameterCategory = 0 ;
+	 parameterNumber = 1 ;
+	}
+#Scaled brightness temperature
+'Numeric' = {
+	 discipline = 3 ;
+	 parameterCategory = 0 ;
+	 parameterNumber = 2 ;
+	}
+#Scaled precipitable water
+'Numeric' = {
+	 discipline = 3 ;
+	 parameterCategory = 0 ;
+	 parameterNumber = 3 ;
+	}
+#Scaled lifted index
+'Numeric' = {
+	 discipline = 3 ;
+	 parameterCategory = 0 ;
+	 parameterNumber = 4 ;
+	}
+#Scaled cloud top pressure
+'Numeric' = {
+	 discipline = 3 ;
+	 parameterCategory = 0 ;
+	 parameterNumber = 5 ;
+	}
+#Scaled skin temperature
+'Numeric' = {
+	 discipline = 3 ;
+	 parameterCategory = 0 ;
+	 parameterNumber = 6 ;
+	}
+#Cloud mask
+'Code table 4.217' = {
+	 discipline = 3 ;
+	 parameterCategory = 0 ;
+	 parameterNumber = 7 ;
+	}
+#Pixel scene type
+'Code table 4.218' = {
+	 discipline = 3 ;
+	 parameterCategory = 0 ;
+	 parameterNumber = 8 ;
+	}
+#Fire detection indicator
+'Code table 4.223' = {
+	 discipline = 3 ;
+	 parameterCategory = 0 ;
+	 parameterNumber = 9 ;
+	}
 #Virtual temperature
 'K' = {
 	 discipline = 0 ;