diff --git a/CHANGELOG.md b/CHANGELOG.md
index 392df41f..e2534e19 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,12 @@
 # OnionShare Changelog
 
+## 2.1
+
+* New feature: Auto-start timer, which allows scheduling when the server starts
+* Renamed CLI argument --debug to --verbose
+* Make Tor connection timeout configurable as a CLI argument
+* New translations: [TODO: include final list]
+
 ## 2.0
 
 * New feature: Receiver mode allows you to receive files with OnionShare, instead of only sending files
diff --git a/share/version.txt b/share/version.txt
index cd5ac039..cd2953d7 100644
--- a/share/version.txt
+++ b/share/version.txt
@@ -1 +1 @@
-2.0
+2.1.dev1