diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5deda4a6..f01c3103 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,36 +1,47 @@
-# ParseLiveQuery-iOS-OSX Changelog
+## ParseLiveQuery-iOS-OSX Changelog
 
-# 2.5.0
+### Master
+
+[Full Changelog](https://github.com/parse-community/ParseLiveQuery-iOS-OSX/compare/2.6.0...master)
+
+### 2.6.0
+
+[Full Changelog](https://github.com/parse-community/ParseLiveQuery-iOS-OSX/compare/2.5.0...2.6.0)
+
+- Added `@objc` to compile with objective-c.  Thanks to [Junya Yamaguchi](https://github.com/junya100) [(#184)](https://github.com/parse-community/ParseLiveQuery-iOS-OSX/pull/184)
+- Encode Date object with `__type: Date`. Thanks to [anafang](https://github.com/ananfang) [#186](https://github.com/parse-community/ParseLiveQuery-iOS-OSX/pull/186)
+
+### 2.5.0
 
 - Bumps Bolts-Swift to 1.4.0
 - Bumps Swift version to 4.2
 
-# 2.4.0
+### 2.4.0
 
 - Bumps Parse SDK to 1.17.0
 - Bumps cocoapods to 1.4.0
 - Set Swift version to 3.2
 
-# 2.3.0
+### 2.3.0
 
 - Bumps Parse SDK to 1.16.0
 - Bumps Starscream to 3.0.4
 - Fixes warnings in Swift 4
 
-# 2.2.3
+### 2.2.3
 
 - Bumps Parse SDK to 1.15.4 and Bolts to 1.9.0, thanks to [marcgovi](https://github.com/marcgovi)
 - Updates logging strategy for websockets, thanks to [Joe Szymanski](https://github.com/JoeSzymanski)
 - Ensures unsubscribed queries are removed from subscriptions list, thanks to [Joe Szymanski](https://github.com/JoeSzymanski)
 - Do not attempt to reconnect if a connection is already in progress, thanks to [Joe Szymanski](https://github.com/JoeSzymanski)
 
-# 2.2.2
+### 2.2.2
 
 - Adds ability to set the clientKey on the connect message, thanks to [bryandel](https://github.com/bryandel)
 - Adds ability to silence the logs, thanks to [ananfang](https://github.com/ananfang)
 - Ensures that `wss` URL's are properly handled, thanks to [Joe Szymanski](https://github.com/JoeSzymanski)
 
-# 2.0.0
+### 2.0.0
 
 - Full carthage support, thanks to [David Starke](https://github.com/dstarke)
 
@@ -41,7 +52,7 @@
 - Adds support for updating subscription, thanks to [Florent Vilmart](https://github.com/flovilmart)
 - Fixes for object decoding
 
-# 1.1.0
+### 1.1.0
 
 - Breaking change: Swift 3 support
 - Breaking change: OSX deployment target to 10.10
diff --git a/ParseLiveQuery.podspec b/ParseLiveQuery.podspec
index 4e44566d..012170d4 100644
--- a/ParseLiveQuery.podspec
+++ b/ParseLiveQuery.podspec
@@ -1,12 +1,12 @@
 Pod::Spec.new do |s|
   s.name             = 'ParseLiveQuery'
-  s.version          = '2.5.0'
+  s.version          = '2.6.0'
   s.license          =  { :type => 'BSD' }
   s.summary          = 'Allows for subscriptions to queries in conjunction with parse-server.'
   s.homepage         = 'http://parseplatform.org'
   s.social_media_url = 'https://twitter.com/ParsePlatform'
   s.authors          = { 'Parse Community' => 'info@parseplatform.org', 'Richard Ross' => 'richardross@fb.com', 'Nikita Lutsenko' => 'nlutsenko@me.com', 'Florent Vilmart' => 'florent@flovilmart.com' }
-  
+
   s.source       = { :git => 'https://github.com/ParsePlatform/ParseLiveQuery-iOS-OSX.git', :tag => s.version.to_s }
 
   s.requires_arc = true
@@ -18,10 +18,10 @@ Pod::Spec.new do |s|
   s.ios.deployment_target = '8.0'
   s.tvos.deployment_target = '9.0'
   s.osx.deployment_target = '10.10'
-  
+
   s.source_files = 'Sources/ParseLiveQuery/**/*.{swift,h}'
   s.module_name = 'ParseLiveQuery'
-  
+
   s.dependency 'Parse', '~> 1.17.0'
   s.dependency 'Bolts-Swift', '~> 1.4.0'
   s.dependency 'Starscream', '~> 3.0.4'
diff --git a/Sources/ParseLiveQuery/Info.plist b/Sources/ParseLiveQuery/Info.plist
index 5a720bd2..fbfefed7 100644
--- a/Sources/ParseLiveQuery/Info.plist
+++ b/Sources/ParseLiveQuery/Info.plist
@@ -15,7 +15,7 @@
 	<key>CFBundlePackageType</key>
 	<string>BNDL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>2.5.0</string>
+	<string>2.6.0</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>