diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6d64410e89..ac1584eaff 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -9,6 +9,8 @@
 -->
 ## Additions
 - Added a couple new tags to set entry as SFW (`sfw` and `non-erotic`)
+- Downloaded chapters now include ComicInfo file
+- Entries' chapters info can be edited using ComicInfo (currently only support chapter number and chapter title)
 
 ## Fixes
 - Fixed smart background colour by page failing causing the image to not load
diff --git a/app/src/main/java/eu/kanade/tachiyomi/source/LocalSource.kt b/app/src/main/java/eu/kanade/tachiyomi/source/LocalSource.kt
index 9d098748b5..109be07a32 100644
--- a/app/src/main/java/eu/kanade/tachiyomi/source/LocalSource.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/source/LocalSource.kt
@@ -305,7 +305,9 @@ class LocalSource(private val context: Context) : CatalogueSource, UnmeteredSour
                         }
                     }
 
-                    ChapterRecognition.parseChapterNumber(this, manga)
+                    chapterComicInfo?.number?.value?.toFloatOrNull()?.let {
+                        chapter_number = it
+                    } ?: ChapterRecognition.parseChapterNumber(this, manga)
                 }
             }
             .sortedWith { c1, c2 ->