diff --git a/ChangeLog.md b/ChangeLog.md
index b4f5f47c..7787b128 100644
--- a/ChangeLog.md
+++ b/ChangeLog.md
@@ -2,6 +2,7 @@
 
 ## Stabilize extensions
 
+* `CLAP_EXT_AMBISONIC`
 * `CLAP_EXT_AUDIO_PORTS_ACTIVATION`
 * `CLAP_EXT_CONFIGURABLE_AUDIO_PORTS`
 * `CLAP_EXT_CONTEXT_MENU`
diff --git a/README.md b/README.md
index 54da3ab0..78c628d6 100644
--- a/README.md
+++ b/README.md
@@ -89,9 +89,9 @@ and use to get a basic plugin experience:
 - [note-ports](include/clap/ext/note-ports.h), define the note ports
 - [audio-ports](include/clap/ext/audio-ports.h), define the audio ports
   - [surround](include/clap/ext/surround.h), inspect surround channel mapping
-  - [ambisonic](include/clap/ext/draft/ambisonic.h), inspect ambisonic channel mapping (draft)
+  - [ambisonic](include/clap/ext/draft/ambisonic.h), inspect ambisonic channel mapping
   - [configurable-audio-ports](include/clap/ext/configurable-audio-ports.h), request the plugin to apply a given configuration
-  - [audio-ports-config](include/clap/ext/audio-ports-config.h), simple list of pre-defined audio ports configurations
+  - [audio-ports-config](include/clap/ext/audio-ports-config.h), simple list of pre-defined audio ports configurations, meant to be exposed to the user
   - [audio-ports-activation](include/clap/ext/audio-ports-activation.h), activate and deactivate a given audio port
   - [extensible-audio-ports](include/clap/ext/draft/extensible-audio-ports.h), let the host add audio ports to the plugin, this is useful for dynamic number of audio inputs (draft)
 - [render](include/clap/ext/render.h), renders realtime or offline
diff --git a/include/clap/all.h b/include/clap/all.h
index 0b3cc230..45412475 100644
--- a/include/clap/all.h
+++ b/include/clap/all.h
@@ -5,7 +5,6 @@
 #include "factory/draft/plugin-invalidation.h"
 #include "factory/draft/plugin-state-converter.h"
 
-#include "ext/draft/ambisonic.h"
 #include "ext/draft/extensible-audio-ports.h"
 #include "ext/draft/resource-directory.h"
 #include "ext/draft/transport-control.h"
diff --git a/include/clap/clap.h b/include/clap/clap.h
index a9874878..b37328a2 100644
--- a/include/clap/clap.h
+++ b/include/clap/clap.h
@@ -35,6 +35,7 @@
 #include "host.h"
 #include "plugin-id.h"
 
+#include "ext/ambisonic.h"
 #include "ext/audio-ports-activation.h"
 #include "ext/audio-ports-config.h"
 #include "ext/audio-ports.h"
diff --git a/include/clap/ext/draft/ambisonic.h b/include/clap/ext/ambisonic.h
similarity index 98%
rename from include/clap/ext/draft/ambisonic.h
rename to include/clap/ext/ambisonic.h
index cf335c49..b213b41a 100644
--- a/include/clap/ext/draft/ambisonic.h
+++ b/include/clap/ext/ambisonic.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "../../plugin.h"
+#include "../plugin.h"
 
 // This extension can be used to specify the channel mapping used by the plugin.
 
diff --git a/include/clap/ext/track-info.h b/include/clap/ext/track-info.h
index 2d96473c..7114a6be 100644
--- a/include/clap/ext/track-info.h
+++ b/include/clap/ext/track-info.h
@@ -7,7 +7,9 @@
 // This extension let the plugin query info about the track it's in.
 // It is useful when the plugin is created, to initialize some parameters (mix, dry, wet)
 // and pick a suitable configuration regarding audio port type and channel count.
-
+//
+// This extension ID contains `draft', yet it is stable.
+// See conventions/extension-id.md for more info.
 static CLAP_CONSTEXPR const char CLAP_EXT_TRACK_INFO[] = "clap.track-info.draft/1";
 
 #ifdef __cplusplus