diff --git a/expfmt/expfmt.go b/expfmt/expfmt.go
index 40035f20..e9caba46 100644
--- a/expfmt/expfmt.go
+++ b/expfmt/expfmt.go
@@ -112,8 +112,8 @@ func NewFormat(t FormatType) Format {
 // NewOpenMetricsFormat generates a new OpenMetrics format matching the
 // specified version number.
 //
-// Note: OpenMetrics version 2.0.0 is experimental and encode-only (currently
-// supporting counter, gauge, and untyped metric types).
+// Note: OpenMetrics version 2.0.0 is experimental and encode-only (supporting
+// counter, gauge, summary, untyped, histogram, and gaugehistogram metric types).
 func NewOpenMetricsFormat(version string) (Format, error) {
 	if version == OpenMetricsVersion_0_0_1 {
 		return FmtOpenMetrics_0_0_1, nil
@@ -122,7 +122,7 @@ func NewOpenMetricsFormat(version string) (Format, error) {
 		return FmtOpenMetrics_1_0_0, nil
 	}
 	if version == OpenMetricsVersion_2_0_0 {
-		// OpenMetrics 2.0.0 is experimental and encode-only (counter/gauge/untyped).
+		// OpenMetrics 2.0.0 is experimental and encode-only.
 		return fmtOpenMetrics_2_0_0, nil
 	}
 	return FmtUnknown, errors.New("unknown open metrics version string")
diff --git a/expfmt/openmetrics_2_0_create.go b/expfmt/openmetrics_2_0_create.go
index d5d8f880..f9b2a3c0 100644
--- a/expfmt/openmetrics_2_0_create.go
+++ b/expfmt/openmetrics_2_0_create.go
@@ -31,9 +31,9 @@ import (
 // It returns the number of bytes written and any error encountered.
 //
 // NOTE: This method targets OpenMetrics 2.0.0 (currently aligned with 2.0-rc.0) which is experimental and
-// encode-only (currently supporting counter, gauge, summary, untyped, histogram, and gaugehistogram metric types).
-// Breaking changes might happen in the future. This implementation is still a
-// work-in-progress, and does not yet support all features of the format.
+// encode-only. All metric types defined in client_model (counter, gauge, summary, untyped, histogram,
+// and gaugehistogram) are supported; info and stateset are not supported as they are not present in
+// client_model. Breaking changes might happen in the future.
 // EncoderOptions are accepted for signature compatibility with
 // MetricFamilyToOpenMetrics and are currently ignored.
 //