diff --git a/CHANGELOG.md b/CHANGELOG.md
index 81555683f..2410b8199 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -16,12 +16,20 @@
 
 ##### Bug Fixes
 
-* None.
+* Fix issue where single-line declaration + bodies in Swift would include the
+  body in the parsed declaration.  
+  [JP Simard](https://github.com/jpsim)
+  [#226](https://github.com/realm/jazzy/issues/226)
 
 * Fix issue where some sections would become empty when using custom groups.  
   [JP Simard](https://github.com/jpsim)
   [#475](https://github.com/realm/jazzy/issues/475)
 
+* Fix issue where directories ending with `.swift` would be considered Swift
+  source files.  
+  [JP Simard](https://github.com/jpsim)
+  [#586](https://github.com/realm/jazzy/issues/586)
+
 ## 0.6.3
 
 ##### Breaking
diff --git a/SourceKitten b/SourceKitten
index 3a70e6b71..cbd962597 160000
--- a/SourceKitten
+++ b/SourceKitten
@@ -1 +1 @@
-Subproject commit 3a70e6b718908d20553df2351f209d966df0ead7
+Subproject commit cbd9625970d968582a218461262a2d70cbb5fb90
diff --git a/lib/jazzy/SourceKitten/Frameworks/SourceKittenFramework.framework/Versions/A/SourceKittenFramework b/lib/jazzy/SourceKitten/Frameworks/SourceKittenFramework.framework/Versions/A/SourceKittenFramework
index 869c64e0f..f3d0d51ab 100755
Binary files a/lib/jazzy/SourceKitten/Frameworks/SourceKittenFramework.framework/Versions/A/SourceKittenFramework and b/lib/jazzy/SourceKitten/Frameworks/SourceKittenFramework.framework/Versions/A/SourceKittenFramework differ
diff --git a/spec/integration_specs b/spec/integration_specs
index 90d9c8c7d..fc1e3d298 160000
--- a/spec/integration_specs
+++ b/spec/integration_specs
@@ -1 +1 @@
-Subproject commit 90d9c8c7d242ded5b78185144c78facdf8c35dd2
+Subproject commit fc1e3d298f7e3beabb032719f72d59314e0d5a7a