diff --git a/CHANGELOG.md b/CHANGELOG.md
index a8954cbe..64ccdba2 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,29 @@
 
 All notable changes to this project will be documented in this file.
 
+## [2.2.0] - unreleased
+
+### Added
+
+- **A meter the panel reports without a breaker space** gets power, energy and current sensors, no switch, and its own place outside the breaker grid.
+- **Circuits that share a meter or relay name each other**, the panel view draws them as one slot, and current monitoring uses their combined rating.
+- **An EV charger lock** where the panel lets the charger be locked, and **busbar current, line frequency and upstream protection rating** sensors where the panel
+  publishes them.
+- **A battery the panel declares gets its device before its first reading**, reading unknown until then, and a battery fed by a circuit reports its connection.
+- **Registration says when to retry** if the panel limits attempts, and setup asks only for the passphrase where the panel does not support proximity.
+
+### Changed
+
+- **Circuits with a solar role read and display as generation**, and solar fed through such a circuit gets a Solar device without a separate inverter device.
+- **A panel that publishes no solar source no longer gets a Solar device or PV Power sensor**; on an upgraded install those entities stay unavailable until removed.
+- **New installs no longer create the Status Postal Code and Status Time Zone sensors**; existing ones stay and keep updating, and diagnostics redact both values.
+- **The panel view draws only the breaker positions the panel has**, and shows a battery charge the panel has not reported as unknown rather than 0%.
+
+### Fixed
+
+- **An energy counter reading beyond what its breaker could ever carry is never used as the dip-compensation baseline**, so it cannot skew energy totals.
+- **The current-monitoring summary is hidden while monitoring is off**, instead of reading "0 circuits".
+
 ## [2.1.3] - 10/2026
 
 ### Changed
diff --git a/custom_components/span_panel/manifest.json b/custom_components/span_panel/manifest.json
index 8145b564..fc2eb5ea 100644
--- a/custom_components/span_panel/manifest.json
+++ b/custom_components/span_panel/manifest.json
@@ -27,7 +27,7 @@
     "span-panel-api-schema-1==1.4.0b1",
     "span-panel-api==3.8.0b1"
   ],
-  "version": "2.1.2",
+  "version": "2.2.0b1",
   "zeroconf": [
     {
       "type": "_span._tcp.local."
diff --git a/pyproject.toml b/pyproject.toml
index 1b5271d2..90240b49 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -1,6 +1,6 @@
 [project]
 name = "span"
-version = "2.1.2"
+version = "2.2.0b1"
 description = "Span Panel Custom Integration for Home Assistant"
 authors = [{name = "SpanPanel"}]
 license = {text = "MIT"}
diff --git a/uv.lock b/uv.lock
index 2c7d9b96..8283042f 100644
--- a/uv.lock
+++ b/uv.lock
@@ -2560,7 +2560,7 @@ wheels = [
 
 [[package]]
 name = "span"
-version = "2.1.2"
+version = "2.2.0b1"
 source = { virtual = "." }
 dependencies = [
     { name = "homeassistant" },