diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index d78584a85..22599dbbb 100644
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -1,3 +1,85 @@
+0.31.0
+
+musikcube:
+* added support for Ubuntu Artsy
+* fixed and exposed album-level artwork. previously it was track-only.
+* fixed notification icon color
+
+musikdroid:
+
+* gapless playback!
+* album art is now displayed in album rows when browsing
+* context menus on most screens with the ability to switch between related 
+  content (e.g. albums by this artist, artists in this genre, etc)
+* preliminary playlist creation support. more to come in the future
+* added a simple "spotlight" tutorial for new users that explains switching
+  between remote and streaming playback modes.
+* major refactor to the entire code base, including the following:
+  - a brand new data layer interface based on RxJava. this should position
+    the app for lots of new, fun stuff in the future.
+  - a new dependency injection implementation
+  - a view component layer for sharing functionality across screens
+* updated Glide from v3 -> v4
+* updated to Android Studio 3.0.1 and related tooling
+
+
+sdk:
+
+* removed all Destroy() methods, standardized on Release() across the board
+* added the following to ISimpleDataProvider:
+  - QueryCategoryWithPredicate()
+  - SavePlaylistWithIds()
+  - SavePlaylistWithExternalIds()
+  - SavePlaylistWithTrackList()
+  - AppendToPlaylistWithIds()
+  - AppendToPlaylistWithExternalIds()
+  - AppendToPlaylistWithTrackList()
+  - RemoveTracksFromPlaylist()
+  - RenamePlaylist()
+  - DeletePlaylist()
+* added new interfaces:
+  - IValue
+  - IEncoder
+  - IEncoderFactory
+* removed interfaces:
+  - IRetainedTrack
+  - IRetainedTrackWriter
+* renamed interfaces
+  - IMetadataMap -> IMap
+  - IMetadataMapList -> IMapList
+  - IMetadataReader -> ITagReader
+  - ITrackWriter -> ITagStore
+  - IMetadataValue -> IValue
+  - IMetadataValueList -> IValueList
+
+server:
+
+* renamed project from `websocket_remote` to `server`, and promoted to a
+  top-level component in the workspace
+* added correct LAME headers after transcoding to fix gapless playback of
+  encoded files.
+* added the following messages to the websocket server:
+  - save_playlist
+  - rename_playlist
+  - delete_playlist
+  - append_to_playlist
+  - remove_tracks_from_playlist 
+  - query_tracks_by_external_ids
+* renamed the following track fields:
+  - visual_genre_id -> genre_id
+  - visual_artist_id -> artist_id
+* added the ability to query album art by id
+* fixed HttpServer to ignore non-GET verbs
+* added "predicated category queries", i.e. "all the albums for this artist" or
+  "all the artists in this genre", etc.
+* added "artist" and "artistId" to album response (previously it was only
+  return "albumArtist" and "albumArtistId")
+* fixed bugs related to HTTP "Range" header parsing and generation
+* fixed a bug in the websocket functionality that was returning invalid
+  "invalid_request" responses... yeah.
+
+--------------------------------------------------------------------------------
+
 0.26.0
 
 * added the ability to rebind UP, DOWN, LEFT, RIGHT, PAGE_UP, PAGE_DOWN, END and
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 36c6b86b6..8a2c411dd 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -7,7 +7,7 @@ cmake_minimum_required(VERSION 3.0)
 
 project(musikcube)
 set (musikcube_VERSION_MAJOR 0)
-set (musikcube_VERSION_MINOR 26)
+set (musikcube_VERSION_MINOR 31)
 set (musikcube_VERSION_PATCH 0)
 set (musikcube_VERSION "${musikcube_VERSION_MAJOR}.${musikcube_VERSION_MINOR}.${musikcube_VERSION_PATCH}")
 
diff --git a/src/musikcube/app/util/Version.h b/src/musikcube/app/util/Version.h
index 626753616..f862a0a14 100644
--- a/src/musikcube/app/util/Version.h
+++ b/src/musikcube/app/util/Version.h
@@ -1,6 +1,6 @@
 #pragma once
 
 #define VERSION_MAJOR 0
-#define VERSION_MINOR 26
+#define VERSION_MINOR 31
 #define VERSION_PATCH 0
-#define VERSION "0.26.0"
+#define VERSION "0.31.0"
diff --git a/src/musikcube/musikcube.rc b/src/musikcube/musikcube.rc
index 5b16eb00e..c60ba1c92 100644
Binary files a/src/musikcube/musikcube.rc and b/src/musikcube/musikcube.rc differ
diff --git a/src/musikdroid/app/build.gradle b/src/musikdroid/app/build.gradle
index 7ec05666e..7c9db7f03 100644
--- a/src/musikdroid/app/build.gradle
+++ b/src/musikdroid/app/build.gradle
@@ -21,8 +21,8 @@ android {
         applicationId "io.casey.musikcube.remote"
         minSdkVersion 21
         targetSdkVersion 26
-        versionCode 23
-        versionName "0.15.3"
+        versionCode 24
+        versionName "0.21.0"
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
     }