diff --git a/CHANGELOG.md b/CHANGELOG.md
index 61f30c2e65..596c200d39 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,20 @@
+## Version 4
+
+* close the share panel after clicking on an item. Fixes [#2034](https://github.com/mozilla-services/pageshot/issues/2034) [61e0664](https://github.com/mozilla-services/pageshot/commit/61e0664)
+* Add a download-only button when you make a
+  selection. [#2024](https://github.com/mozilla-services/pageshot/issues/2024)
+* track og:image images differently than other
+  direct link images. Fixes [#2041](https://github.com/mozilla-services/pageshot/issues/2041) [8dfd52e](https://github.com/mozilla-services/pageshot/commit/8dfd52e)
+* fix regression from updating the selection. A
+  previous 'fix' to double-clicking the Save button actually suppressed
+  subsequent updates of the selection. Fixes [#2046](https://github.com/mozilla-services/pageshot/issues/2046) [d331fdd](https://github.com/mozilla-services/pageshot/commit/d331fdd)
+* add a $CONTROLLER_SINGLETON variable that controls
+  if this server instance should handle database upgrades and periodic tasks. Fixes [#1978](https://github.com/mozilla-services/pageshot/issues/1978) [2d4df88](https://github.com/mozilla-services/pageshot/commit/2d4df88)
+* even if user.initialize() is called many times, do
+  not keep sending requests to the server. Fixes [#1956](https://github.com/mozilla-services/pageshot/issues/1956) [85db7e7](https://github.com/mozilla-services/pageshot/commit/85db7e7)
+* do not show error popup on startup if we can't
+  login to the server. Fixes [#2006](https://github.com/mozilla-services/pageshot/issues/2006) [738eedf](https://github.com/mozilla-services/pageshot/commit/738eedf)
+
 ## Version 3
 
 ### In-browser UI changes
diff --git a/addon/package.json b/addon/package.json
index 9b93177ba1..611c35ce60 100644
--- a/addon/package.json
+++ b/addon/package.json
@@ -8,7 +8,7 @@
   "homepage": "https://github.com/mozilla-services/pageshot",
   "icon": "data/icon.png",
   "license": "MPL 2.0",
-  "version": "3.3.0",
+  "version": "4.0.0",
   "main": "./lib/main",
   "preferences": [
     {
diff --git a/package.json b/package.json
index 31641e576c..c473943462 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "pageshot",
   "description": "An experiment in creating better shareable versions of content.",
-  "version": "3.3.0",
+  "version": "4.0.0",
   "author": "Mozilla (https://mozilla.org/)",
   "bugs": {
     "url": "https://github.com/mozilla-services/pageshot/issues"