diff --git a/CHANGELOG.md b/CHANGELOG.md
index fcb1b2e..184464b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -15,18 +15,26 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 - `metadata` wrapper for description/version in marketplace.json
 - Keywords to all plugin manifests for better discoverability
 - `commands` and `agents` directory references to plugin manifests
+- Versioning rule: version displayed only in main README.md title
 
 ### Changed
 - Updated marketplace.json with required fields per Claude Code spec
 - Fixed installation documentation to use official Claude Code methods
 - Prioritized public HTTPS URL over Tailscale SSH URL in documentation
 - Updated all plugin manifests with author, homepage, repository, license fields
+- Consolidated version display to main README.md title only
+- Removed version numbers from plugin documentation titles
 
 ### Fixed
 - Plugin manifests now include all required fields per Claude Code spec
 - Installation section uses `extraKnownMarketplaces` instead of undocumented `pluginMarketplace`
 
-## [2.1.0] - Previous Release
+### Removed
+- `docs/references/` directory (obsolete planning documents)
+- Version numbers from individual plugin README titles
+- Version section from plugins/projman/README.md
+
+## [2.1.0] - 2026-01-15
 
 ### Added
 - `docs/CANONICAL-PATHS.md` - Single source of truth for all file paths
@@ -37,16 +45,12 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 - Update documentation (`docs/UPDATING.md`)
 - `/initial-setup` slash command
 - File creation governance rules in CLAUDE.md
-- Architecture diagram specifications in `docs/architecture/`
 - `.scratch/` directory for transient work
 - `scripts/` directory for setup automation
-- `docs/architecture/` for Draw.io diagrams
-- `docs/workflows/` for workflow documentation
 
 ### Changed
 - Replaced `docs/CORRECT-ARCHITECTURE.md` reference with `docs/CANONICAL-PATHS.md`
 - Added mandatory path verification section to CLAUDE.md
-- Reorganized documentation into `docs/references/`, `docs/architecture/`, `docs/workflows/`
 - Updated CLAUDE.md with file creation governance
 
 ### Fixed
@@ -54,21 +58,44 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 
 ### Removed
 - Organization/workspace GID variable (no longer needed)
-- Deprecated `cmdb-assistant/` plugin
 - Development output files (test scripts, status reports)
 - IDE-specific workspace files
 - Stray files from project root
 
-## [0.1.0] - Initial Release
+## [2.0.0] - 2026-01-06
 
 ### Added
-- projman plugin for sprint management
+- Full Gitea integration with wiki, milestones, dependencies
+- Parallel execution batching via dependency graph
+- Wiki tools for lessons learned (`create_lesson`, `search_lessons`)
+- Milestone tools (`list_milestones`, `create_milestone`, `update_milestone`)
+- Dependency tools (`list_issue_dependencies`, `create_issue_dependency`, `get_execution_order`)
+- Validation tools (`validate_repo_org`, `get_branch_protection`)
+- MCP servers bundled inside plugins (not shared at root)
+
+### Changed
+- MCP server architecture: bundled in plugins instead of shared at root
+- Configuration uses `${CLAUDE_PLUGIN_ROOT}/mcp-servers/` paths
+
+## [1.0.0] - 2025-12-15
+
+### Added
+- projman plugin with basic sprint commands
+- `/sprint-plan`, `/sprint-start`, `/sprint-status`, `/sprint-close` commands
+- `/labels-sync` command for label taxonomy synchronization
+- Three-agent model (planner, orchestrator, executor)
+- Gitea MCP server with issue and label tools
+- 43-label taxonomy system
+- Hybrid configuration system (system + project level)
+- Branch-aware security model
+
+## [0.1.0] - 2025-12-01
+
+### Added
+- Initial repository structure
+- projman plugin structure (planned)
 - projman-pmo plugin structure (planned)
 - project-hygiene plugin for cleanup automation
-- Gitea MCP server
-- Wiki.js MCP server
-- 43-label taxonomy system
-- Lessons learned capture system
-- Hybrid configuration system (system + project level)
-- Three-agent model (planner, orchestrator, executor)
-- Branch-aware security model
+- claude-config-maintainer plugin structure
+- cmdb-assistant plugin structure
+- Basic marketplace manifest
diff --git a/CLAUDE.md b/CLAUDE.md
index 638f19c..eaef7a1 100644
--- a/CLAUDE.md
+++ b/CLAUDE.md
@@ -181,15 +181,35 @@ Stored in Gitea Wiki under `lessons-learned/sprints/`.
 | `plugins/projman/CONFIGURATION.md` | Projman setup guide |
 | `plugins/projman/README.md` | Projman full documentation |
 
-## Versioning Rule
+## Versioning and Changelog Rules
 
+### Version Display
 **The marketplace version is displayed ONLY in the main `README.md` title.**
 
 - Format: `# Claude Code Marketplace - vX.Y.Z`
 - Do NOT add version numbers to individual plugin documentation titles
 - Do NOT add version numbers to configuration guides
-- Version history is maintained in `CHANGELOG.md`
-- When releasing a new version, update ONLY the main README.md title
+- Do NOT add version numbers to CLAUDE.md or other docs
+
+### Changelog Maintenance (MANDATORY)
+**`CHANGELOG.md` is the authoritative source for version history.**
+
+When releasing a new version:
+1. Update main `README.md` title with new version
+2. Update `CHANGELOG.md` with:
+   - Version number and date: `## [X.Y.Z] - YYYY-MM-DD`
+   - **Added**: New features, commands, files
+   - **Changed**: Modifications to existing functionality
+   - **Fixed**: Bug fixes
+   - **Removed**: Deleted features, files, deprecated items
+3. Update `marketplace.json` metadata version
+4. Update plugin `plugin.json` versions if plugin-specific changes
+
+### Version Format
+- Follow [Semantic Versioning](https://semver.org/): MAJOR.MINOR.PATCH
+- MAJOR: Breaking changes
+- MINOR: New features, backward compatible
+- PATCH: Bug fixes, minor improvements
 
 ---