diff --git a/CHANGES.md b/CHANGES.md
index 31d6fb18..bfb70f15 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -1,4 +1,16 @@
-## next version
+## 0.7
+
+- add Span_link.of_span_ctx, Scope.to_span_ctx, dummy values
+- feat: add Span_context, as required by OTEL API guidelines
+- feat: record backtraces in error spans
+- compat with trace 0.6
+- ocurl: add ticker_interval_ms config
+- ocurl: do some self-tracing optionally
+- move protobuf code to opentelemetry.proto
+
+- perf: rewrite parsing+printing for span ctx as w3c trace ctx
+- perf: when we get multiple messages, check batches only once
+- perf: use ocaml-protoc 3.0.1 for codegen, with faster pbrt
 
 ## 0.6
 
diff --git a/Makefile b/Makefile
index d20dde92..e9b4957d 100644
--- a/Makefile
+++ b/Makefile
@@ -19,3 +19,9 @@ format:
 WATCH ?= @all
 watch:
 	@dune build $(WATCH) -w $(OPTS)
+
+VERSION=$(shell awk '/^version:/ {print $$2}' opentelemetry.opam)
+update_next_tag:
+	@echo "update version to $(VERSION)..."
+	sed -i "s/NEXT_VERSION/$(VERSION)/g" $(wildcard src/**/*.ml) $(wildcard src/**/*.mli)
+	sed -i "s/NEXT_RELEASE/$(VERSION)/g" $(wildcard src/*.ml) $(wildcard src/**/*.ml) $(wildcard src/*.mli) $(wildcard src/**/*.mli)
diff --git a/dune-project b/dune-project
index bf3cd457..478434af 100644
--- a/dune-project
+++ b/dune-project
@@ -7,7 +7,7 @@
 (source
  (github imandra-ai/ocaml-opentelemetry))
 
-(version 0.6)
+(version 0.7)
 
 (authors "the Imandra team and contributors")
 
diff --git a/opentelemetry-client-cohttp-lwt.opam b/opentelemetry-client-cohttp-lwt.opam
index a9b605ac..c2cb3305 100644
--- a/opentelemetry-client-cohttp-lwt.opam
+++ b/opentelemetry-client-cohttp-lwt.opam
@@ -1,6 +1,6 @@
 # This file is generated by dune, edit dune-project instead
 opam-version: "2.0"
-version: "0.6"
+version: "0.7"
 synopsis: "Collector client for opentelemetry, using cohttp + lwt"
 maintainer: [
   "Simon Cruanes <simon.cruanes.2007@m4x.org>"
diff --git a/opentelemetry-client-ocurl.opam b/opentelemetry-client-ocurl.opam
index 95ac3e33..4070a5c0 100644
--- a/opentelemetry-client-ocurl.opam
+++ b/opentelemetry-client-ocurl.opam
@@ -1,6 +1,6 @@
 # This file is generated by dune, edit dune-project instead
 opam-version: "2.0"
-version: "0.6"
+version: "0.7"
 synopsis: "Collector client for opentelemetry, using http + ezcurl"
 maintainer: [
   "Simon Cruanes <simon.cruanes.2007@m4x.org>"
diff --git a/opentelemetry-cohttp-lwt.opam b/opentelemetry-cohttp-lwt.opam
index 1a94cada..ed7950c8 100644
--- a/opentelemetry-cohttp-lwt.opam
+++ b/opentelemetry-cohttp-lwt.opam
@@ -1,6 +1,6 @@
 # This file is generated by dune, edit dune-project instead
 opam-version: "2.0"
-version: "0.6"
+version: "0.7"
 synopsis: "Opentelemetry tracing for Cohttp HTTP servers"
 maintainer: [
   "Simon Cruanes <simon.cruanes.2007@m4x.org>"
diff --git a/opentelemetry-lwt.opam b/opentelemetry-lwt.opam
index ed0f50b8..82bae68c 100644
--- a/opentelemetry-lwt.opam
+++ b/opentelemetry-lwt.opam
@@ -1,6 +1,6 @@
 # This file is generated by dune, edit dune-project instead
 opam-version: "2.0"
-version: "0.6"
+version: "0.7"
 synopsis: "Lwt-compatible instrumentation for https://opentelemetry.io"
 maintainer: [
   "Simon Cruanes <simon.cruanes.2007@m4x.org>"
diff --git a/opentelemetry.opam b/opentelemetry.opam
index 7bf6f815..cae04f6a 100644
--- a/opentelemetry.opam
+++ b/opentelemetry.opam
@@ -1,6 +1,6 @@
 # This file is generated by dune, edit dune-project instead
 opam-version: "2.0"
-version: "0.6"
+version: "0.7"
 synopsis: "Instrumentation for https://opentelemetry.io"
 maintainer: [
   "Simon Cruanes <simon.cruanes.2007@m4x.org>"
diff --git a/src/client-ocurl/config.mli b/src/client-ocurl/config.mli
index dfc35c08..07b34c43 100644
--- a/src/client-ocurl/config.mli
+++ b/src/client-ocurl/config.mli
@@ -26,10 +26,10 @@ type t = private {
           This will be clamped between [2 ms] and some longer
           interval (maximum [60s] currently).
       Default 500.
-      @since NEXT_RELEASE *)
+      @since 0.7 *)
   self_trace: bool;
       (** If true, the OTEL library will also emit its own spans. Default [false].
-          @since NEXT_RELEASE *)
+          @since 0.7 *)
 }
 (** Configuration.
 
diff --git a/src/core/opentelemetry.ml b/src/core/opentelemetry.ml
index 9ca7748d..165e7e3a 100644
--- a/src/core/opentelemetry.ml
+++ b/src/core/opentelemetry.ml
@@ -12,7 +12,7 @@ module Rand_bytes = Rand_bytes
 
 module AList = AList
 (** Atomic list, for internal usage
-    @since NEXT_RELEASE *)
+    @since 0.7 *)
 
 (** {2 Wire format} *)
 
@@ -386,7 +386,7 @@ end
 (** Span context. This bundles up a trace ID and parent ID.
 
     https://opentelemetry.io/docs/specs/otel/trace/api/#spancontext
-    @since NEXT_RELEASE *)
+    @since 0.7 *)
 module Span_ctx : sig
   type t