diff --git a/CHANGES.rst b/CHANGES.rst
index 7fe92eb0d7..41c941edce 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -1,3 +1,9 @@
+Changes in 0.6.4 (2017-12-05)
+===============================================
+
+Bug Fix:
+ * Crypto: The share key dialog can appear with a 'null' device (#1683).
+
 Changes in 0.6.3 (2017-11-30)
 ===============================================
 
diff --git a/Riot/Info.plist b/Riot/Info.plist
index cf6c50b7fc..a7a49315b7 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.3</string>
+	<string>0.6.4</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>0.6.3</string>
+	<string>0.6.4</string>
 	<key>ITSAppUsesNonExemptEncryption</key>
 	<true/>
 	<key>ITSEncryptionExportComplianceCode</key>
diff --git a/RiotShareExtension/Info.plist b/RiotShareExtension/Info.plist
index 12e3b58e99..dece2523ee 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.3</string>
+	<string>0.6.4</string>
 	<key>CFBundleVersion</key>
 	<string>1</string>
 	<key>NSExtension</key>
diff --git a/SiriIntents/Info.plist b/SiriIntents/Info.plist
index b49f6a3957..4d95aa21e1 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.3</string>
+	<string>0.6.4</string>
 	<key>CFBundleVersion</key>
 	<string>1</string>
 	<key>NSExtension</key>