diff --git a/HISTORY.rst b/HISTORY.rst
index 1f21a52..22859cc 100644
--- a/HISTORY.rst
+++ b/HISTORY.rst
@@ -3,6 +3,22 @@ History
 -------
 
 
+7.0.0 (2016-04-28)
+++++++++++++++++++
+
+- Queue heartbeats and send to wakatime-cli after 4 seconds.
+- Nest settings menu under Package Settings.
+- Upgrade wakatime-cli to v6.0.0.
+- Increase default network timeout to 60 seconds when sending heartbeats to
+  the api.
+- New --extra-heartbeats command line argument for sending a JSON array of
+  extra queued heartbeats to STDIN.
+- Change --entitytype command line argument to --entity-type.
+- No longer allowing --entity-type of url.
+- Support passing an alternate language to cli to be used when a language can
+  not be guessed from the code file.
+
+
 6.0.8 (2016-04-18)
 ++++++++++++++++++
 
diff --git a/WakaTime.py b/WakaTime.py
index 7e63d47..df6f660 100644
--- a/WakaTime.py
+++ b/WakaTime.py
@@ -7,7 +7,7 @@ Website:     https://wakatime.com/
 ==========================================================="""
 
 
-__version__ = '6.0.8'
+__version__ = '7.0.0'
 
 
 import sublime