diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7dbbf74..588d60c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,8 +5,16 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## Unreleased [3.0.0-alpha]
 
-## Unreleased
+While this is unreleased, please only add v3 features here.
+Rebasing master onto v3 doesn't require a changelog update.
+
+### Added
+
+- ...
+
+## Unreleased [2.x.x]
 
 ### Added
 - Enabled using both short and long IDs for playlist_change_details
diff --git a/setup.py b/setup.py
index b1a4165..a1a6f8a 100644
--- a/setup.py
+++ b/setup.py
@@ -18,7 +18,7 @@ extra_reqs = {
 
 setup(
     name='spotipy',
-    version='2.17.1',
+    version='3.0.0-alpha',
     description='A light weight Python library for the Spotify Web API',
     long_description=long_description,
     long_description_content_type="text/markdown",