diff --git a/CHANGELOG.md b/CHANGELOG.md
index ee15418..ec3c574 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,28 @@
+2.1.4 / 2019-08-31
+==================
+
+**General**
+* Make user pages show the team's score and place information instead of the user's information if in team mode
+* Allow admins to search users by IP address
+* Require password for email address changes in the user profile
+* The place indicator in `Teams Mode` on the team pages and user pages now correctly excludes hidden teams
+* Fix scoreboard place ordinalization in Python 3
+* Fix for a crash where imports will fail on SQLite due to lack of ALTER command support
+* Fix for an issue where files downloaded via S3 would have the folder name in the filename
+* Make `Users.get_place()` and `Teams.get_place()` for return None instead of 0 if the account has no rank/place
+* Properly redirect users or 403 if the endpoint requires a team but the user isn't in one
+* Show affiliation in user and team pages in the admin panel and public and private user and team pages
+
+**Themes**
+* Remove invalid `id='submit'` on submit buttons in various theme files
+* Set `tabindex` to 0 since we don't really care for forcing tab order
+* Rename `statistics.js` to `graphs.js` in the Admin Panel as it was identified that adblockers can sometimes block the file
+
+**API**
+* The team profile endpoint (`/api/v1/teams/me`) will now return 403 instead of 400 if the requesting user is not the captain
+* The Challenge API will now properly freeze the solve count to freeze time
+
+
 2.1.3 / 2019-06-22
 ==================
 
@@ -734,4 +759,4 @@ If you are upgrading from a prior version be sure to make backups and have a rev
 
 **Merged pull requests:**
 
-- Merged 42 pull requests before tagging 1.0.0
\ No newline at end of file
+- Merged 42 pull requests before tagging 1.0.0
diff --git a/CTFd/__init__.py b/CTFd/__init__.py
index 5edf733..e776141 100644
--- a/CTFd/__init__.py
+++ b/CTFd/__init__.py
@@ -28,7 +28,7 @@ if sys.version_info[0] < 3:
     reload(sys)  # noqa: F821
     sys.setdefaultencoding("utf-8")
 
-__version__ = "2.1.3"
+__version__ = "2.1.4"
 
 
 class CTFdRequest(Request):
diff --git a/docs/conf.py b/docs/conf.py
index 74a3933..ff67588 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -26,7 +26,7 @@ author = u'Kevin Chung'
 # The short X.Y version
 version = u''
 # The full version, including alpha/beta/rc tags
-release = u'2.1.3'
+release = u'2.1.4'
 
 
 # -- General configuration ---------------------------------------------------