diff --git a/CHANGES.rst b/CHANGES.rst
index 4f026c6d9..aacada115 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -1,3 +1,12 @@
+Changes in 0.6.15 (2018-04-23)
+===============================================
+
+Improvements:
+ * Upgrade MatrixKit version (v0.7.11).
+ 
+Bug fix:
+ * Regression: Sending a photo from the photo library causes a crash.
+ 
 Changes in 0.6.14 (2018-04-20)
 ===============================================
 
diff --git a/Podfile b/Podfile
index e938d26e0..5a7f90730 100644
--- a/Podfile
+++ b/Podfile
@@ -9,7 +9,7 @@ source 'https://github.com/CocoaPods/Specs.git'
 
 # Different flavours of pods to MatrixKit
 # The current MatrixKit pod version
-$matrixKitVersion = '0.7.10'
+$matrixKitVersion = '0.7.11'
 
 # The develop branch version
 #$matrixKitVersion = 'develop'
diff --git a/Podfile.lock b/Podfile.lock
index bece7ff90..756593f9a 100644
--- a/Podfile.lock
+++ b/Podfile.lock
@@ -43,34 +43,34 @@ PODS:
   - GZIP (1.2.1)
   - HPGrowingTextView (1.1)
   - libPhoneNumber-iOS (0.9.13)
-  - MatrixKit (0.7.10):
+  - MatrixKit (0.7.11):
     - cmark (~> 0.24.1)
     - DTCoreText (~> 1.6.21)
     - HPGrowingTextView (~> 1.1)
     - libPhoneNumber-iOS (~> 0.9.13)
-    - MatrixKit/Core (= 0.7.10)
-    - MatrixSDK (= 0.10.8)
-  - MatrixKit/AppExtension (0.7.10):
+    - MatrixKit/Core (= 0.7.11)
+    - MatrixSDK (= 0.10.9)
+  - MatrixKit/AppExtension (0.7.11):
     - cmark (~> 0.24.1)
     - DTCoreText (~> 1.6.21)
     - DTCoreText/Extension
     - HPGrowingTextView (~> 1.1)
     - libPhoneNumber-iOS (~> 0.9.13)
-    - MatrixSDK (= 0.10.8)
-  - MatrixKit/Core (0.7.10):
+    - MatrixSDK (= 0.10.9)
+  - MatrixKit/Core (0.7.11):
     - cmark (~> 0.24.1)
     - DTCoreText (~> 1.6.21)
     - HPGrowingTextView (~> 1.1)
     - libPhoneNumber-iOS (~> 0.9.13)
-    - MatrixSDK (= 0.10.8)
-  - MatrixSDK (0.10.8):
-    - MatrixSDK/Core (= 0.10.8)
-  - MatrixSDK/Core (0.10.8):
+    - MatrixSDK (= 0.10.9)
+  - MatrixSDK (0.10.9):
+    - MatrixSDK/Core (= 0.10.9)
+  - MatrixSDK/Core (0.10.9):
     - AFNetworking (~> 3.2.0)
     - GZIP (~> 1.2.1)
     - OLMKit (~> 2.2.2)
     - Realm (~> 3.3.2)
-  - MatrixSDK/JingleCallStack (0.10.8):
+  - MatrixSDK/JingleCallStack (0.10.9):
     - MatrixSDK/Core
     - WebRTC (= 63.11.20455)
   - OLMKit (2.2.2):
@@ -90,8 +90,8 @@ DEPENDENCIES:
   - cmark
   - DTCoreText
   - GBDeviceInfo (~> 5.1.0)
-  - MatrixKit (= 0.7.10)
-  - MatrixKit/AppExtension (= 0.7.10)
+  - MatrixKit (= 0.7.11)
+  - MatrixKit/AppExtension (= 0.7.11)
   - MatrixSDK/JingleCallStack
   - OLMKit
   - PiwikTracker (from `https://github.com/manuroe/matomo-sdk-ios.git`, branch `feature/CustomVariables`)
@@ -115,13 +115,13 @@ SPEC CHECKSUMS:
   GZIP: 7ee835f989fb3c6ea79005fc90b8fa6af710a70d
   HPGrowingTextView: 88a716d97fb853bcb08a4a08e4727da17efc9b19
   libPhoneNumber-iOS: e444379ac18bbfbdefad571da735b2cd7e096caa
-  MatrixKit: 524aa527ce302731ce322f8ab01724c226e538e6
-  MatrixSDK: 9a974388ae38996f639358aea9cc442163012dc7
+  MatrixKit: fa148ae8eef4e60e65d36af0af1be28fc8264935
+  MatrixSDK: 5c3a0ddfa141775d88565e627f491a066dd1e87c
   OLMKit: b9d8c0ffee9ea8c45bc0aaa9afb47f93fba7efbd
   PiwikTracker: 42862c7b13028065c3dfd36b4dc38db8a5765acf
   Realm: d927fbf66df5532cfafc08afb5f7e53ded37b894
   WebRTC: f2a6203584745fe53532633397557876b5d71640
 
-PODFILE CHECKSUM: ebbd8236ca52d1c288efd2a3eb5d5ef0b05ffc1b
+PODFILE CHECKSUM: a3ec9e9795d74a34aeaa86fdbc1983a365e93e9a
 
 COCOAPODS: 1.4.0
diff --git a/Riot/Info.plist b/Riot/Info.plist
index 93a3e982e..ac347a01c 100644
--- a/Riot/Info.plist
+++ b/Riot/Info.plist
@@ -17,11 +17,11 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>0.6.14</string>
+	<string>0.6.15</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>0.6.14</string>
+	<string>0.6.15</string>
 	<key>ITSAppUsesNonExemptEncryption</key>
 	<true/>
 	<key>ITSEncryptionExportComplianceCode</key>
diff --git a/RiotShareExtension/Info.plist b/RiotShareExtension/Info.plist
index a4705a96a..adae233be 100644
--- a/RiotShareExtension/Info.plist
+++ b/RiotShareExtension/Info.plist
@@ -17,7 +17,7 @@
 	<key>CFBundlePackageType</key>
 	<string>XPC!</string>
 	<key>CFBundleShortVersionString</key>
-	<string>0.6.14</string>
+	<string>0.6.15</string>
 	<key>CFBundleVersion</key>
 	<string>1</string>
 	<key>NSExtension</key>
diff --git a/SiriIntents/Info.plist b/SiriIntents/Info.plist
index 2b55db8f7..25ff2e906 100644
--- a/SiriIntents/Info.plist
+++ b/SiriIntents/Info.plist
@@ -17,7 +17,7 @@
 	<key>CFBundlePackageType</key>
 	<string>XPC!</string>
 	<key>CFBundleShortVersionString</key>
-	<string>0.6.14</string>
+	<string>0.6.15</string>
 	<key>CFBundleVersion</key>
 	<string>1</string>
 	<key>NSExtension</key>